Merge pull request #197 from symfony-cmf/alexander-schranz-enhancement/symfony-5-support

Add support for symfony 5

Author: dbu

.travis.yml

@@ -38,16 +38,18 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-lowest --prefer-stable" SYMFONY_REQUIRE=3.4.* SYMFONY_PHPUNIT_VERSION=6 SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.4
       env: SYMFONY_REQUIRE=4.3.*
+    - php: 7.4
+      env: SYMFONY_REQUIRE=4.4.* SYMFONY_PHPUNIT_VERSION=7
     - php: 7.4
       env: SYMFONY_REQUIRE=4.4.*
     - php: 7.4
-      env: SYMFONY_REQUIRE=4.4.* SYMFONY_PHPUNIT_VERSION=7
+      env: SYMFONY_REQUIRE=5.0.*
     - php: 7.4
-      env: STABILITY="dev" SYMFONY_VERSION=4.4.*
+      env: STABILITY="dev"
   fast_finish: true
   allow_failures:
     - php: 7.4
-      env: STABILITY="dev" SYMFONY_REQUIRE=4.4.*
+      env: STABILITY="dev"
 
 before_install:
   - phpenv config-rm xdebug.ini || true

composer.json

@@ -18,19 +18,19 @@
         "friendsofsymfony/jsrouting-bundle": "^1.1 || ^2.1",
         "jackalope/jackalope": "^1.3",
         "jackalope/jackalope-doctrine-dbal": "^1.3",
-        "symfony/browser-kit": "^3.4.22 || ^4.1",
-        "symfony/console": "^3.4.22 || ^4.1",
-        "symfony/css-selector": "^3.4.22 || ^4.1",
-        "symfony/debug": "^3.4.22 || ^4.1",
-        "symfony/dependency-injection": "^3.4.22 || ^4.1",
-        "symfony/doctrine-bridge": "^3.4.22 || ^4.1",
-        "symfony/framework-bundle": "^3.4.22 || ^4.1",
-        "symfony/http-foundation": "^3.4.22 || ^4.1",
-        "symfony/http-kernel": "^3.4.22 || ^4.1",
-        "symfony/monolog-bundle": "~3.1",
-        "symfony/process": "^3.4.22 || ^4.1",
-        "symfony/security-bundle": "^3.4.22 || ^4.1",
-        "symfony/twig-bundle": "^3.4.22 || ^4.1",
+        "symfony/browser-kit": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/console": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/css-selector": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/debug": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/dependency-injection": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/doctrine-bridge": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/framework-bundle": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/http-foundation": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/http-kernel": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/monolog-bundle": "~3.1 || ^5.0",
+        "symfony/process": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/security-bundle": "^3.4.22 || ^4.1 || ^5.0",
+        "symfony/twig-bundle": "^3.4.22 || ^4.1 || ^5.0",
         "symfony/phpunit-bridge": "^4.2.2"
     },
     "autoload": {

src/Functional/BaseTestCase.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Bundle\PHPCRBundle\Test\RepositoryManager;
 use Symfony\Bundle\FrameworkBundle\Client;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Cmf\Component\Testing\Functional\DbManager\PhpcrDecorator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -52,7 +53,10 @@ protected function getKernelConfiguration(): array
         return [];
     }
 
-    public function getFrameworkBundleClient(): Client
+    /**
+     * @return Client|KernelBrowser
+     */
+    public function getFrameworkBundleClient()
     {
         if (null === $this->client) {
             // property does not exist in all symfony versions

tests/Functional/BaseTestCaseTest.php

@@ -12,24 +12,35 @@
 namespace Symfony\Cmf\Component\Testing\Tests\Functional;
 
 use Doctrine\Bundle\PHPCRBundle\Test\RepositoryManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Client;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Cmf\Component\Testing\Functional\DbManager\PHPCR;
 use Symfony\Cmf\Component\Testing\Tests\Fixtures\TestTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 class BaseTestCaseTest extends TestCase
 {
+    /**
+     * @var ContainerInterface|MockObject
+     */
     private $container;
 
+    /**
+     * @var KernelInterface|MockObject
+     */
     private $kernel;
 
     /**
      * @var TestTestCase
      */
     private $testCase;
 
+    /**
+     * @var KernelBrowser|Client|MockObject
+     */
     private $client;
 
     protected function setUp(): void
@@ -51,7 +62,12 @@ protected function setUp(): void
         $this->testCase = new TestTestCase();
         $this->testCase->setKernel($this->kernel);
 
-        $this->client = $this->createMock(Client::class);
+        if (class_exists(KernelBrowser::class)) {
+            $this->client = $this->createMock(KernelBrowser::class);
+        } else {
+            $this->client = $this->createMock(Client::class);
+        }
+
         $this->client->expects($this->any())
             ->method('getContainer')
             ->willReturn($this->container);
@@ -79,7 +95,11 @@ public function provideTestDb()
 
     public function testItCanProvideAFrameworkBundleClient()
     {
-        $this->assertInstanceOf(Client::class, $this->testCase->getFrameworkBundleClient());
+        if (class_exists(KernelBrowser::class)) {
+            $this->assertInstanceOf(KernelBrowser::class, $this->testCase->getFrameworkBundleClient());
+        } else {
+            $this->assertInstanceOf(Client::class, $this->testCase->getFrameworkBundleClient());
+        }
     }
 
     /**