From f4373a82128f1da3705340ef3a625951b81b2cf7 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Mon, 25 Jan 2016 15:34:12 +0000 Subject: [PATCH 1/2] Bump to use PHPUnit 4.8 / stable packages --- composer.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index f26cf7f..2198171 100644 --- a/composer.json +++ b/composer.json @@ -17,12 +17,12 @@ ], "require": { - "php": ">=5.3.2", - "phpunit/phpunit": "3.7.*", - "behat/behat": "2.5.*@stable", - "behat/mink": "1.6.*@stable", - "behat/mink-extension": "1.3.*-dev", - "behat/mink-selenium2-driver": "1.2.*@stable", + "php": ">=5.3.3", + "phpunit/phpunit": "~4.8", + "behat/behat": "~2.5.0", + "behat/mink": "~1.6.0", + "behat/mink-extension": "~1.3.0", + "behat/mink-selenium2-driver": "~1.2.0", "symfony/dom-crawler": "~2.0", "symfony/console": "~2.0", "symfony/config": "~2.0", @@ -55,5 +55,6 @@ "dev-master": "2.0.x-dev" } }, + "prefer-stable": true, "minimum-stability": "dev" } From c7ea9ef0b9f4207419600ea69d61f4d795ca3314 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 23 Feb 2016 22:51:56 +1300 Subject: [PATCH 2/2] Remove Behat-related code dependant on PHPUnit 3.x We've upgraded SilverStripe core to PHPUnit 4.x now, and the Functions.php has moved locations. Since all custom contexts either use one of these contexts, or extend off SilverStripeContext, we can be certain that the required assertions are automatically included for custom contexts, no need to duplicate the require_once() calls. Note that Behat 3.x suggests using static methods on a class, e.g. PHPUnit_Framework_Assert::assertSame (see http://docs.behat.org/en/master/quick_intro.html). This seems quite verbose, and increases the upgrade burden on any project using Behat. --- .../BehatExtension/Console/Processor/InitProcessor.php | 4 ---- src/SilverStripe/BehatExtension/Context/BasicContext.php | 3 +-- src/SilverStripe/BehatExtension/Context/EmailContext.php | 3 +-- src/SilverStripe/BehatExtension/Context/FixtureContext.php | 3 +-- src/SilverStripe/BehatExtension/Context/LoginContext.php | 3 +-- .../BehatExtension/Context/SilverStripeContext.php | 2 ++ 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php b/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php index b42c052..c273a14 100644 --- a/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php +++ b/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php @@ -153,10 +153,6 @@ use SilverStripe\BehatExtension\Context\SilverStripeContext, SilverStripe\Framework\Test\Behaviour\CmsUiContext, SilverStripe\Cms\Test\Behaviour; -// PHPUnit -require_once 'PHPUnit/Autoload.php'; -require_once 'PHPUnit/Framework/Assert/Functions.php'; - /** * Features context * diff --git a/src/SilverStripe/BehatExtension/Context/BasicContext.php b/src/SilverStripe/BehatExtension/Context/BasicContext.php index 2e06e90..a6a3e66 100644 --- a/src/SilverStripe/BehatExtension/Context/BasicContext.php +++ b/src/SilverStripe/BehatExtension/Context/BasicContext.php @@ -13,8 +13,7 @@ use Behat\Gherkin\Node\PyStringNode, Behat\Gherkin\Node\TableNode; // PHPUnit -require_once 'PHPUnit/Autoload.php'; -require_once 'PHPUnit/Framework/Assert/Functions.php'; +require_once BASE_PATH . '/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php'; /** * BasicContext diff --git a/src/SilverStripe/BehatExtension/Context/EmailContext.php b/src/SilverStripe/BehatExtension/Context/EmailContext.php index 2ed15bd..a23f6ae 100644 --- a/src/SilverStripe/BehatExtension/Context/EmailContext.php +++ b/src/SilverStripe/BehatExtension/Context/EmailContext.php @@ -14,8 +14,7 @@ Behat\Gherkin\Node\TableNode; use Symfony\Component\DomCrawler\Crawler; // PHPUnit -require_once 'PHPUnit/Autoload.php'; -require_once 'PHPUnit/Framework/Assert/Functions.php'; +require_once BASE_PATH . '/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php'; /** * Context used to define steps related to email sending. diff --git a/src/SilverStripe/BehatExtension/Context/FixtureContext.php b/src/SilverStripe/BehatExtension/Context/FixtureContext.php index e365e8b..9888be6 100644 --- a/src/SilverStripe/BehatExtension/Context/FixtureContext.php +++ b/src/SilverStripe/BehatExtension/Context/FixtureContext.php @@ -9,8 +9,7 @@ use Behat\Behat\Context\BehatContext, SilverStripe\Filesystem\Storage\AssetStore; // PHPUnit -require_once 'PHPUnit/Autoload.php'; -require_once 'PHPUnit/Framework/Assert/Functions.php'; +require_once BASE_PATH . '/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php'; /** * Context used to create fixtures in the SilverStripe ORM. diff --git a/src/SilverStripe/BehatExtension/Context/LoginContext.php b/src/SilverStripe/BehatExtension/Context/LoginContext.php index 81fb553..9a27d90 100644 --- a/src/SilverStripe/BehatExtension/Context/LoginContext.php +++ b/src/SilverStripe/BehatExtension/Context/LoginContext.php @@ -11,8 +11,7 @@ use Behat\Gherkin\Node\PyStringNode, Behat\Gherkin\Node\TableNode; // PHPUnit -require_once 'PHPUnit/Autoload.php'; -require_once 'PHPUnit/Framework/Assert/Functions.php'; +require_once BASE_PATH . '/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php'; /** * LoginContext diff --git a/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php b/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php index 0e9aa94..9f18272 100644 --- a/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php +++ b/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php @@ -20,6 +20,8 @@ use Symfony\Component\Yaml\Yaml; // Mink etc. require_once 'vendor/autoload.php'; +require_once BASE_PATH . '/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php'; + /** * SilverStripeContext *