From fa332364765a9bf23981e8e9474597e62addd662 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 23 Oct 2017 10:10:57 +0100 Subject: [PATCH 01/13] Allow Symfony 4 --- .travis.yml | 2 ++ composer.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb7ede3..a82b842 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ matrix: env: DEPS=dev SYMFONY_VERSION='3.0.*' - php: 7.1 env: DEPS=dev SYMFONY_VERSION='3.0.*' + - php: 7.1 + env: DEVS=dev SYMFONY_VERSION='4.0.*' allow_failures: - php: 7.0 env: SYMFONY_VERSION='3.0.*' diff --git a/composer.json b/composer.json index 1779619..8778b59 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,11 @@ "require": { "php": ">=5.3.3", "behat/behat": "~3.0,>=3.0.4", - "symfony/framework-bundle": "~2.0|~3.0" + "symfony/framework-bundle": "~2.0|~3.0|~4.0" }, "require-dev": { - "symfony/symfony": "~2.1|~3.0", + "symfony/symfony": "~2.1|~3.0|~4.0", "behat/mink-extension": "~2.0", "behat/mink-browserkit-driver": "~1.0", "phpspec/phpspec": "~2.0", From 1a2c66bd6f4e654ee4fcc8ad436fa18f8dcb899b Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 23 Oct 2017 10:12:51 +0100 Subject: [PATCH 02/13] Remove tests for Symfony 2.3 and 3.0. Test for 3.3.x --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a82b842..5750010 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,24 +14,19 @@ cache: matrix: include: - - php: 5.3 - env: SYMFONY_VERSION='2.3.*' - dist: precise - php: 5.5 env: SYMFONY_VERSION='2.7.*' - php: 5.6 env: SYMFONY_VERSION='2.8.*' - - php: 7.0 - env: DEPS=dev SYMFONY_VERSION='3.0.*' - php: 7.1 - env: DEPS=dev SYMFONY_VERSION='3.0.*' + env: SYMFONY_VERSION='3.3.*' + - php: 7.1 + env: DEPS=dev SYMFONY_VERSION='3.4.*' - php: 7.1 env: DEVS=dev SYMFONY_VERSION='4.0.*' allow_failures: - - php: 7.0 - env: SYMFONY_VERSION='3.0.*' - php: 7.1 - env: SYMFONY_VERSION='3.0.*' + env: SYMFONY_VERSION='4.0.*' before_install: - composer self-update From e490b8cf27c89b0b2e9737126a93e870b12da3cf Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 23 Oct 2017 10:16:32 +0100 Subject: [PATCH 03/13] Uses `4.0.x-dev` for SF4 version for now --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5750010..b27a7d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ matrix: - php: 7.1 env: DEPS=dev SYMFONY_VERSION='3.4.*' - php: 7.1 - env: DEVS=dev SYMFONY_VERSION='4.0.*' + env: DEVS=dev SYMFONY_VERSION='4.0.x-dev' allow_failures: - php: 7.1 - env: SYMFONY_VERSION='4.0.*' + env: SYMFONY_VERSION='4.0.x-dev' before_install: - composer self-update From 6e39bf4dded833378a028b408dd638063f03344d Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Thu, 23 Nov 2017 12:44:20 +0000 Subject: [PATCH 04/13] Bump mininum version of behat to 2.4.0 and uses double-quoted arguments --- composer.json | 2 +- doc/index.rst | 2 +- testapp/behat.yml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 8778b59..5dd37ea 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", - "behat/behat": "~3.0,>=3.0.4", + "behat/behat": "~3.4.0", "symfony/framework-bundle": "~2.0|~3.0|~4.0" }, diff --git a/doc/index.rst b/doc/index.rst index 7afb654..50ff4d7 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -129,7 +129,7 @@ argument of the :code:`FeatureContext` context. default: contexts: - FeatureContext: - simpleArg: '%%kernel.environment%%' + simpleArg: '%%%%kernel.environment%%%%' session: '@session' extensions: Behat\Symfony2Extension: ~ diff --git a/testapp/behat.yml b/testapp/behat.yml index f0f2411..2a78b97 100644 --- a/testapp/behat.yml +++ b/testapp/behat.yml @@ -19,19 +19,19 @@ default: type: symfony_bundle contexts: - Behat\Sf2DemoBundle\Features\Context\WebContext: - simpleParameter: "%%custom_app%%" + simpleParameter: "%%%%custom_app%%%%" simpleArg: 'string' session: '@session' services: - '@session' - '@session.storage.filesystem' params: - - "%%kernel.root_dir%%" - - "%%kernel.environment%%" - - "%%kernel.debug%%" - - "%%kernel.name%%" - nestedParam: 'nested_parameter_%%custom_app%%' - collectionParam: '%%collection_param%%' + - "%%%%kernel.root_dir%%%%" + - "%%%%kernel.environment%%%%" + - "%%%%kernel.debug%%%%" + - "%%%%kernel.name%%%%" + nestedParam: 'nested_parameter_%%%%custom_app%%%%' + collectionParam: '%%%%collection_param%%%%' bundle: 'BehatSf2DemoBundle' filters: tags: '@web' From fa88cad6493ab5b2e98c245ac8ef3974aecef33d Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Thu, 23 Nov 2017 12:49:15 +0000 Subject: [PATCH 05/13] Add upgrade notes for the arguments --- UPGRADE-3.0.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 UPGRADE-3.0.md diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md new file mode 100644 index 0000000..64a1cdd --- /dev/null +++ b/UPGRADE-3.0.md @@ -0,0 +1,23 @@ +# UPGRADE FROM 2.x to 3.0 + +* Arguments from your Symfony application container need to be double quoted. + + Before: + ```yaml + default: + suites: + web: + contexts: + - Behat\Sf2DemoBundle\Features\Context\WebContext: + simpleParameter: "%%custom_app%%" + ``` + + After: + ```yaml + default: + suites: + web: + contexts: + - Behat\Sf2DemoBundle\Features\Context\WebContext: + simpleParameter: "%%%%custom_app%%%%" + ``` From 13d6adf92f9aef116b9cdd9fd6efea9765aea3a3 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Thu, 23 Nov 2017 12:51:41 +0000 Subject: [PATCH 06/13] Allow PHPUnit 5.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5dd37ea..22fb539 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "behat/mink-extension": "~2.0", "behat/mink-browserkit-driver": "~1.0", "phpspec/phpspec": "~2.0", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0|~5.0" }, "autoload": { From 7cb0b326ca8399c185e1016a92117beb182c17c8 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Fri, 24 Nov 2017 10:22:54 +0000 Subject: [PATCH 07/13] Allow PhpSpec 3.x & 4.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 22fb539..43c2239 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "symfony/symfony": "~2.1|~3.0|~4.0", "behat/mink-extension": "~2.0", "behat/mink-browserkit-driver": "~1.0", - "phpspec/phpspec": "~2.0", + "phpspec/phpspec": "~2.0|~3.0|~4.0", "phpunit/phpunit": "~4.0|~5.0" }, From 3ed73211cc18c8537785e3b9b21287266a9233f1 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 27 Nov 2017 10:39:42 +0000 Subject: [PATCH 08/13] Revert "Bump mininum version of behat to 2.4.0 and uses double-quoted arguments" This reverts commit 6e39bf4dded833378a028b408dd638063f03344d. --- composer.json | 2 +- doc/index.rst | 2 +- testapp/behat.yml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 43c2239..e41e553 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", - "behat/behat": "~3.4.0", + "behat/behat": "~3.0,>=3.0.4", "symfony/framework-bundle": "~2.0|~3.0|~4.0" }, diff --git a/doc/index.rst b/doc/index.rst index 50ff4d7..7afb654 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -129,7 +129,7 @@ argument of the :code:`FeatureContext` context. default: contexts: - FeatureContext: - simpleArg: '%%%%kernel.environment%%%%' + simpleArg: '%%kernel.environment%%' session: '@session' extensions: Behat\Symfony2Extension: ~ diff --git a/testapp/behat.yml b/testapp/behat.yml index 2a78b97..f0f2411 100644 --- a/testapp/behat.yml +++ b/testapp/behat.yml @@ -19,19 +19,19 @@ default: type: symfony_bundle contexts: - Behat\Sf2DemoBundle\Features\Context\WebContext: - simpleParameter: "%%%%custom_app%%%%" + simpleParameter: "%%custom_app%%" simpleArg: 'string' session: '@session' services: - '@session' - '@session.storage.filesystem' params: - - "%%%%kernel.root_dir%%%%" - - "%%%%kernel.environment%%%%" - - "%%%%kernel.debug%%%%" - - "%%%%kernel.name%%%%" - nestedParam: 'nested_parameter_%%%%custom_app%%%%' - collectionParam: '%%%%collection_param%%%%' + - "%%kernel.root_dir%%" + - "%%kernel.environment%%" + - "%%kernel.debug%%" + - "%%kernel.name%%" + nestedParam: 'nested_parameter_%%custom_app%%' + collectionParam: '%%collection_param%%' bundle: 'BehatSf2DemoBundle' filters: tags: '@web' From ded425aa5354a592caa9c6a043dc11883848bd77 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 27 Nov 2017 10:39:51 +0000 Subject: [PATCH 09/13] Revert "Add upgrade notes for the arguments" This reverts commit fa88cad6493ab5b2e98c245ac8ef3974aecef33d. --- UPGRADE-3.0.md | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 UPGRADE-3.0.md diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md deleted file mode 100644 index 64a1cdd..0000000 --- a/UPGRADE-3.0.md +++ /dev/null @@ -1,23 +0,0 @@ -# UPGRADE FROM 2.x to 3.0 - -* Arguments from your Symfony application container need to be double quoted. - - Before: - ```yaml - default: - suites: - web: - contexts: - - Behat\Sf2DemoBundle\Features\Context\WebContext: - simpleParameter: "%%custom_app%%" - ``` - - After: - ```yaml - default: - suites: - web: - contexts: - - Behat\Sf2DemoBundle\Features\Context\WebContext: - simpleParameter: "%%%%custom_app%%%%" - ``` From 4a36a9c2eecfdb9f8f5e9eb656481d70f0bf012b Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 27 Nov 2017 10:40:33 +0000 Subject: [PATCH 10/13] Minimum verison of behat/behat is 3.4.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e41e553..08b4da1 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", - "behat/behat": "~3.0,>=3.0.4", + "behat/behat": "^3.4.3", "symfony/framework-bundle": "~2.0|~3.0|~4.0" }, From 8c6ac10cf9e8c9e4d0f16eaf8992e3183ab41320 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Mon, 4 Dec 2017 15:04:37 +0000 Subject: [PATCH 11/13] Uses `@dev` versions of mink --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 08b4da1..c6d421e 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "require-dev": { "symfony/symfony": "~2.1|~3.0|~4.0", "behat/mink-extension": "~2.0", - "behat/mink-browserkit-driver": "~1.0", + "behat/mink": "~1.7@dev", + "behat/mink-browserkit-driver": "~1.3@dev", "phpspec/phpspec": "~2.0|~3.0|~4.0", "phpunit/phpunit": "~4.0|~5.0" }, From aa60c18d4f819ee099e8a8e4a8a7a040f78ccf7a Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Wed, 13 Dec 2017 15:19:19 +0000 Subject: [PATCH 12/13] Do not use options non supported by Symfony 4 --- testapp/app/config/config.yml | 3 +-- testapp/behat.yml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/testapp/app/config/config.yml b/testapp/app/config/config.yml index c77e831..0d82793 100644 --- a/testapp/app/config/config.yml +++ b/testapp/app/config/config.yml @@ -6,11 +6,10 @@ framework: form: true validation: { enable_annotations: true } default_locale: en - trusted_proxies: ~ session: ~ parameters: custom_app: 'behat-test-app' collection_param: - 'Param 1' - - 'Param 2' \ No newline at end of file + - 'Param 2' diff --git a/testapp/behat.yml b/testapp/behat.yml index f0f2411..ef6da1c 100644 --- a/testapp/behat.yml +++ b/testapp/behat.yml @@ -24,7 +24,6 @@ default: session: '@session' services: - '@session' - - '@session.storage.filesystem' params: - "%%kernel.root_dir%%" - "%%kernel.environment%%" From 529f8b33ab2832f9bdb5dbcc73818e4e62313d99 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Wed, 13 Dec 2017 15:22:01 +0000 Subject: [PATCH 13/13] Uses Symfony 4.0.* instead the dev version for the "stable" builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b27a7d4..95d354c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: - php: 7.1 env: DEPS=dev SYMFONY_VERSION='3.4.*' - php: 7.1 - env: DEVS=dev SYMFONY_VERSION='4.0.x-dev' + env: DEVS=dev SYMFONY_VERSION='4.0.*' allow_failures: - php: 7.1 env: SYMFONY_VERSION='4.0.x-dev'