Merge pull request #41 from alexislefebvre/use-phpunit-6

PHPUnit: Allow 6.2
alexislefebvre · Jul 29, 2017 · ef0b56f · ef0b56f
2 parents eae446a + 4d950b5
commit ef0b56f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,14 +17,14 @@ php:
 
 env:
   - SYMFONY_VERSION="2.8.*"
-  - SYMFONY_VERSION="3.2.*"
+  - SYMFONY_VERSION="3.3.*"
 
 matrix:
   include:
     - php: 5.6
       env: SYMFONY_VERSION="2.7.*"
     - php: 7.0
-      env: SYMFONY_VERSION="3.1.*"
+      env: SYMFONY_VERSION="3.2.*"
 
 # Only send code coverage to Code Climate for the current versions of PHP and Symfony LTS
 # https://github.com/doctrine/doctrine2/blob/3570f4a49afc7e98fed71e0596dded6a39d4fd7b/.travis.yml#L16
@@ -35,7 +35,7 @@ before_install:
 
 install:
   - composer require --dev symfony/symfony:${SYMFONY_VERSION} $DEPENDENCY --no-update
-  - composer install --no-interaction -vv --profile --no-progress
+  - composer install --no-interaction --profile --no-progress
 
 script: php ./vendor/bin/phpunit $PHPUNIT_FLAGS && php ./vendor/bin/behat
 

diff --git a/Tests/Entity/MediaTest.php b/Tests/Entity/MediaTest.php
@@ -4,7 +4,7 @@
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Media;
 
-class MediaTest extends \PHPUnit_Framework_TestCase
+class MediaTest extends \PHPUnit\Framework\TestCase
 {
     public function testTweet()
     {

diff --git a/Tests/Entity/TweetTest.php b/Tests/Entity/TweetTest.php
@@ -6,7 +6,7 @@
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Tweet;
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\User;
 
-class TweetTest extends \PHPUnit_Framework_TestCase
+class TweetTest extends \PHPUnit\Framework\TestCase
 {
     public function testTweet()
     {

diff --git a/Tests/Entity/UserTest.php b/Tests/Entity/UserTest.php
@@ -4,7 +4,7 @@
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\User;
 
-class UserTest extends \PHPUnit_Framework_TestCase
+class UserTest extends \PHPUnit\Framework\TestCase
 {
     public function testUser()
     {

diff --git a/Tests/Features/Context/FeatureContext.php b/Tests/Features/Context/FeatureContext.php
@@ -40,7 +40,7 @@ public function thereIsATweet()
      */
     public function theTweetMustHaveCorrectId()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             152120320,
             $this->tweet->getId()
         );
@@ -51,7 +51,7 @@ public function theTweetMustHaveCorrectId()
      */
     public function theTweetMustHaveCorrectCreatedAtDate()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             $this->now,
             $this->tweet->getCreatedAt()
         );
@@ -62,7 +62,7 @@ public function theTweetMustHaveCorrectCreatedAtDate()
      */
     public function theTweetMustHaveCorrectText()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             'Hello World!',
             $this->tweet->getText()
         );
@@ -73,7 +73,7 @@ public function theTweetMustHaveCorrectText()
      */
     public function theTweetMustHaveCorrectRetweetCount()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             1999,
             $this->tweet->getRetweetCount()
         );
@@ -84,7 +84,7 @@ public function theTweetMustHaveCorrectRetweetCount()
      */
     public function theTweetMustHaveCorrectFavoriteCount()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             42,
             $this->tweet->getFavoriteCount()
         );
@@ -95,7 +95,7 @@ public function theTweetMustHaveCorrectFavoriteCount()
      */
     public function theTweetMustBeInTimeline()
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->tweet->isInTimeline()
         );
     }

diff --git a/circle.yml b/circle.yml
@@ -8,7 +8,7 @@ dependencies:
     - rm /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini
   override:
     - composer require --dev "symfony/symfony:2.8.*" --no-update
-    - composer install --no-interaction -vv --profile --no-progress
+    - composer install --no-interaction --profile --no-progress
 
 test:
   override:

diff --git a/composer.json b/composer.json
@@ -14,16 +14,16 @@
     "require" : {
         "php": ">=5.5",
         "symfony/symfony": "~2.7 || ~3.0",
-        "abraham/twitteroauth": "^0.6.0",
-        "knplabs/friendly-contexts": "~0.8"
+        "abraham/twitteroauth": "^0.6.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.4.8",
         "symfony/assetic-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
         "doctrine/doctrine-fixtures-bundle": "~2.3",
         "liip/functional-test-bundle": "~1.4",
-        "phpunit/phpunit": "4.8.* || ~5.1",
+        "phpunit/phpunit": "~5.7.21||~6.2",
+        "knplabs/friendly-contexts": "~0.8",
         "behat/behat": "^3.2",
         "behat/symfony2-extension": "^2.1",
         "behat/mink": "^1.7",