Merge pull request #3 from facile-it/fix-ci-and-symfony5-support

Fix ci and symfony5 support

Author: Jean85

.travis.yml

@@ -1,29 +1,22 @@
 language: php
 
 php:
-  - 7.1
-  - 7.2
-  - 7.3
   - 7.4
-
-sudo: false
+  - 7.3
+  - 7.2
+  - 7.1
 
 cache:
   directories:
     - $HOME/.composer/cache
 
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.4snapshot
-
 stages:
   - Test
   - Code style & static analysis
 
 before_install:
   - phpenv config-rm xdebug.ini || echo "Unable to remove xDebug"
-  - if [[ $TRAVIS_PHP_VERSION != '7.1' ]]; then export SYMFONY_DEPRECATIONS_HELPER=disabled; fi
+  - if [ "$SYMFONY_REQUIRE" != "" ]; then composer global require symfony/flex; fi
 
 install:
   - composer update --no-interaction --no-suggest --prefer-dist --prefer-stable
@@ -39,6 +32,14 @@ jobs:
         SYMFONY_DEPRECATIONS_HELPER: disabled
       install:
         - composer update --prefer-lowest --no-interaction --no-suggest --prefer-dist --prefer-stable
+    - php: 7.1
+      env:
+        SYMFONY_REQUIRE: 3.4
+        SYMFONY_DEPRECATIONS_HELPER: disabled
+    - env:
+        SYMFONY_REQUIRE: 4.4
+    - env:
+        SYMFONY_REQUIRE: 5
     - name: Code coverage
       php: 7.3
       before_install: []

CHANGELOG.md

@@ -4,10 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 ## Unreleased
+ * Fix Symfony 5 compatibility [#3](https://github.com/facile-it/symfony-functional-testcase/pull/3)
+ * Improve CI testing [#3](https://github.com/facile-it/symfony-functional-testcase/pull/3)
 
 ## 0.1.2 [2020-02-24]
 ### Added
- * Adds symfony5 compatibility 
+ * Adds Symfony 5 compatibility [#2](https://github.com/facile-it/symfony-functional-testcase/pull/2)
 
 ## 0.1.1 [2019-03-13]
 ### Added

composer.json

@@ -24,15 +24,18 @@
         "symfony/framework-bundle": "^3.4|^4.0|^5.0"
     },
     "require-dev": {
-        "symfony/symfony": "^3.4|^4.0|^5.0",
-        "symfony/phpunit-bridge": "^5.0",
-        "phpunit/phpunit": "^7.5|^8",
-        "php-coveralls/php-coveralls": "^2.1",
-        "phpstan/phpstan": "^0.11.2",
-        "phpstan/phpstan-phpunit": "^0.11.0",
-        "jangregor/phpstan-prophecy": "^0.3.0",
         "facile-it/facile-coding-standard": "^0.3.1",
-        "symfony/monolog-bundle": "^3.0"
+        "jangregor/phpstan-prophecy": "^0.6.2",
+        "php-coveralls/php-coveralls": "^2.1",
+        "phpstan/phpstan": "^0.12.18",
+        "phpstan/phpstan-phpunit": "^0.12.6",
+        "phpunit/phpunit": "^7.5.20|^8.5.2",
+        "symfony/browser-kit": "^3.4|^4.0|^5.0",
+        "symfony/monolog-bundle": "^3.0",
+        "symfony/monolog-bridge": ">=3",
+        "symfony/phpunit-bridge": "^5.0",
+        "symfony/security-bundle": "^3.4|^4.0|^5.0",
+        "symfony/security-core": "^3.4|^4.0|^5.0"
     },
     "suggest": {
         "facile-it/paraunit": "A PHPUnit wrapper to execute tests in parallel"
@@ -48,13 +51,15 @@
         }
     },
     "config": {
-        "platform": {
-            "php": "7.1.99"
-        }
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
             "dev-master": "1.x-dev"
         }
+    },
+    "scripts": {
+        "cs-check": "php-cs-fixer fix --dry-run --diff",
+        "cs-fix": "php-cs-fixer fix --diff"
     }
 }

phpstan.neon

@@ -3,6 +3,8 @@ parameters:
     paths:
         - src
         - tests
-includes:
-	- vendor/jangregor/phpstan-prophecy/src/extension.neon
-	- vendor/phpstan/phpstan-phpunit/extension.neon
+    ignoreErrors:
+        -
+            message: "#^Class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Client not found\\.$#"
+            count: 1
+            path: src/WebTestCase.php

src/WebTestCase.php

@@ -4,14 +4,17 @@
 
 namespace Facile\SymfonyFunctionalTestCase;
 
-use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
 
+if (! class_exists(KernelBrowser::class)) {
+    \class_alias(\Symfony\Bundle\FrameworkBundle\Client::class, KernelBrowser::class);
+}
+
 abstract class WebTestCase extends BaseWebTestCase
 {
     /** @var string */
@@ -80,23 +83,23 @@ protected function getContainer(): ContainerInterface
      * $client matches the expected code. If not, raises an error with more
      * information.
      */
-    public function assertStatusCode(int $expectedStatusCode, Client $client, string $message = ''): void
+    public function assertStatusCode(int $expectedStatusCode, KernelBrowser $client, string $message = ''): void
     {
         $response = $client->getResponse();
 
         $this->assertInstanceOf(Response::class, $response, 'Response missing from client');
         $this->assertSame($expectedStatusCode, $response->getStatusCode(), $message);
     }
 
-    protected function assertStatusCodeIsSuccessful(Client $client): void
+    protected function assertStatusCodeIsSuccessful(KernelBrowser $client): void
     {
         $response = $client->getResponse();
 
         $this->assertInstanceOf(Response::class, $response, 'Response missing from client');
         $this->assertTrue($response->isSuccessful(), 'HTTP status code not successful: ' . $response->getStatusCode());
     }
 
-    protected function assertStatusCodeIsRedirect(Client $client): void
+    protected function assertStatusCodeIsRedirect(KernelBrowser $client): void
     {
         $response = $client->getResponse();
 
@@ -107,7 +110,7 @@ protected function assertStatusCodeIsRedirect(Client $client): void
     protected function tearDown(): void
     {
         foreach ($this->containers as $container) {
-            if ($container instanceof ResettableContainerInterface) {
+            if (method_exists($container, 'reset')) {
                 $container->reset();
             }
         }

tests/App/AppKernel.php

@@ -5,7 +5,6 @@
 namespace Facile\SymfonyFunctionalTestCase\Tests\App;
 
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
@@ -16,7 +15,6 @@ public function registerBundles(): array
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Symfony\Bundle\MonologBundle\MonologBundle(),
             new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
-            new \Symfony\Bundle\TwigBundle\TwigBundle(),
             new AcmeBundle(),
         ];
 
@@ -26,12 +24,6 @@ public function registerBundles(): array
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__ . '/config.yml');
-
-        $loader->load(function (ContainerBuilder $container): void {
-            $container->loadFromExtension('framework', [
-                'assets' => null,
-            ]);
-        });
     }
 
     public function getCacheDir(): string

tests/App/config.yml

@@ -4,7 +4,7 @@
 framework:
     secret:          secret
     test: ~
-    router:          { resource: "%kernel.root_dir%/../App/routing.yml" }
+    router:          { resource: "%kernel.project_dir%/tests/App/routing.yml" }
     form:            false
     validation:      false
     csrf_protection: true
@@ -61,7 +61,3 @@ services:
         tags: ['console.command']
     Facile\SymfonyFunctionalTestCase\Tests\App\Command\TestStatusCodeCommand:
         tags: ['console.command']
-
-twig:
-    strict_variables: true
-    exception_controller: ~

tests/AppConfig/AppConfigKernel.php

@@ -58,11 +58,4 @@ public function testRunCommandStatusCode(): void
 
         $this->assertSame(10, $commandTester->getStatusCode());
     }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        unset($commandTester);
-    }
 }