Merge pull request liip#508 from alexislefebvre/1.x-allow-phpunit-7

1.x: Allow PHPUnit 7, remove PHP 5.6 support

Author: alexislefebvre

.travis.yml

@@ -3,8 +3,6 @@ dist: trusty
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
 
@@ -19,18 +17,15 @@ services:
 
 matrix:
   include:
-    - php: 5.6
-      env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.1
-      env: SYMFONY_VERSION="2.7.*"
+      env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.1
       env: SYMFONY_VERSION="2.8.*"
     - php: 7.2
       env: SYMFONY_VERSION="3.4.*"
   fast_finish: true
 
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION != '7.0' && $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != '7.2' ]]; then phpenv config-rm xdebug.ini; fi
   - echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi
 

README.md

@@ -511,7 +511,7 @@ use Liip\FunctionalTestBundle\Test\WebTestCase;
 
 class AccountControllerTest extends WebTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $em = $this->getContainer()->get('doctrine')->getManager();
         if (!isset($metadatas)) {
@@ -557,7 +557,7 @@ class LoadMemberAccounts extends AbstractFixture
 and then in the test case setup:
 ```php
 ...
-    public function setUp()
+    public function setUp(): void
     {
         $this->fixtures = $this->loadFixtures([
             'AppBundle\Tests\Fixtures\LoadMemberAccounts'

Test/ValidationErrorsConstraint.php

@@ -93,7 +93,7 @@ public function evaluate($other, $description = '', $returnResult = false)
      *
      * @return string
      */
-    public function toString()
+    public function toString(): string
     {
         return 'validation errors match';
     }

Tests/App/AppKernel.php

@@ -24,7 +24,6 @@ public function registerBundles()
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(),

Tests/Command/CommandTest.php

@@ -206,7 +206,7 @@ public function testRunCommandVerbosityOutOfBound()
         $this->runCommand('command:test');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 

Tests/DependencyInjection/ConfigurationTest.php

@@ -21,7 +21,7 @@ class ConfigurationTest extends WebTestCase
     /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
     private $container = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $client = static::makeClient();
         $this->container = $client->getContainer();

Tests/Test/WebTestCaseConfigMysqlTest.php

@@ -40,7 +40,7 @@ protected static function getKernelClass()
         return 'AppConfigMysqlKernel';
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         // https://github.com/liip/LiipFunctionalTestBundle#non-sqlite
         $em = $this->getContainer()->get('doctrine')->getManager();

Tests/Test/WebTestCaseConfigPhpcrTest.php

@@ -33,7 +33,7 @@ protected static function getKernelClass()
         return 'AppConfigPhpcrKernel';
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         // https://github.com/liip/LiipFunctionalTestBundle#non-sqlite
         $em = $this->getContainer()->get('doctrine')->getManager();

Tests/Test/WebTestCaseTest.php

@@ -25,7 +25,7 @@ class WebTestCaseTest extends WebTestCase
     /** @var \Symfony\Bundle\FrameworkBundle\Client client */
     private $client = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = static::makeClient();
     }
@@ -728,7 +728,7 @@ public function testJsonIsSuccesful()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 

composer.json

@@ -15,20 +15,19 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "^2.7|^3.0",
-        "symfony/browser-kit": "^2.7|^3.0",
+        "php": "^7.1",
+        "symfony/framework-bundle": "^2.8.39|^3.4",
+        "symfony/browser-kit": "^2.8.39|^3.4",
         "doctrine/common": "~2.0"
     },
     "require-dev": {
-        "symfony/symfony": "^2.7.1|^3.3",
-        "symfony/phpunit-bridge": "^2.7|^3.0",
+        "symfony/symfony": "^2.8.39|^3.4",
+        "symfony/phpunit-bridge": "^2.8.39|^3.4",
         "doctrine/orm": "~2.5",
-        "symfony/console": "^2.7|^3.0",
-        "symfony/assetic-bundle": "^2.7|^3.0",
-        "symfony/monolog-bundle": "^2.7|^3.0",
+        "symfony/console": "^2.8.39|^3.4",
+        "symfony/monolog-bundle": "^3.2",
         "doctrine/doctrine-fixtures-bundle": "~2.3",
-        "phpunit/phpunit": "^4.8.35|^5.7|^6.1",
+        "phpunit/phpunit": "^6.1|^7.0",
         "twig/twig": "~1.12|~2.0",
         "nelmio/alice": "~1.7|~2.0",
         "jackalope/jackalope-doctrine-dbal": "1.1.*|1.2.*",
@@ -39,7 +38,7 @@
         "doctrine/data-fixtures": "1.2.2"
     },
     "conflict": {
-        "phpunit/phpunit": ">=7"
+        "phpunit/phpunit": ">=8"
     },
     "suggest": {
         "doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality",