Merge pull request #527 from alexislefebvre/2.x-revert-feature/cherry…

…-pick-4.3 2.x revert feature/cherry pick 4.3
liip · Jun 14, 2019 · 7b4e401 · 7b4e401
2 parents 464c7a2 + 100a6b3
commit 7b4e401
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 118 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,8 +28,6 @@ matrix:
       env: EXTRA_PACKAGES="doctrine/phpcr-bundle:^1.3 brianium/paratest:^1.0 doctrine/phpcr-odm:^1.3"
     - php: 7.3
       env: SYMFONY_VERSION="^4.1"
-    - php: 7.3
-      env: SYMFONY_VERSION="^4.3"
   allow_failures:
     - php: 7.2
       env: SYMFONY_VERSION="dev-master"

diff --git a/composer.json b/composer.json
@@ -33,6 +33,9 @@
         "theofidry/alice-data-fixtures": "^1.0.1",
         "twig/twig": "^2.0"
     },
+    "conflict": {
+        "symfony/framework-bundle": "4.3.0"
+    },
     "suggest": {
         "brianium/paratest": "Required when using paratest to parallelize tests",
         "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite",

diff --git a/src/DependencyInjection/Compiler/SetTestClientPass.php b/src/DependencyInjection/Compiler/SetTestClientPass.php
@@ -33,12 +33,6 @@ public function process(ContainerBuilder $container): void
             $definition = $container->getDefinition('test.client');
             $definition->setPublic(false);
             $container->setDefinition('liip_functional_test.query.count_client.parent', $definition);
-        } elseif ($container->hasAlias('test.client')) {
-            // Symfony <2.8
-            $container->setAlias(
-                'liip_functional_test.query.count_client.parent',
-                new Alias((string) $container->getAlias('test.client'), false)
-            );
         } else {
             throw new \Exception('The LiipFunctionalTestBundle\'s Query Counter can only be used in the test environment.'.PHP_EOL.'See https://github.com/liip/LiipFunctionalTestBundle#only-in-test-environment');
         }

diff --git a/src/QueryCountClient.php b/src/QueryCountClient.php
@@ -15,13 +15,19 @@
 
 use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CompilerDebugDumpPass;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 
 // Symfony <4 BC
 if (class_exists(CompilerDebugDumpPass::class)) {
     class_alias(QueryCountClientSymfony3Trait::class, QueryCountClientTrait::class);
 }
 
-class QueryCountClient extends Client
+// Symfony <4.3.1 BC
+if (!class_exists(KernelBrowser::class)) {
+    class_alias(Client::class, KernelBrowser::class);
+}
+
+class QueryCountClient extends KernelBrowser
 {
     /*
      * We use trait only because of Client::request signature strict type mismatch between Symfony 3 and 4.

diff --git a/src/Test/WebTestCase.php b/src/Test/WebTestCase.php
@@ -40,9 +40,6 @@
  */
 abstract class WebTestCase extends BaseWebTestCase
 {
-    /** @var Client|null */
-    protected static $client;
-
     protected $environment = 'test';
 
     protected $containers;
@@ -413,7 +410,7 @@ protected function makeClient($authentication = false, array $params = []): Clie
             $session->save();
         }
 
-        return static::$client = $client;
+        return $client;
     }
 
     /**
@@ -571,8 +568,3 @@ protected function tearDown(): void
         parent::tearDown();
     }
 }
-
-// Compatibility layer for Symfony 4.3+
-if (class_exists('Symfony\Bundle\FrameworkBundle\KernelBrowser')) {
-    class_alias('Symfony\Bundle\FrameworkBundle\KernelBrowser', 'Symfony\Bundle\FrameworkBundle\Client');
-}
diff --git a/tests/DependencyInjection/Compiler/SetTestClientPassMockTest.php b/tests/DependencyInjection/Compiler/SetTestClientPassMockTest.php
@@ -25,36 +25,6 @@
  */
 class SetTestClientPassMockTest extends TestCase
 {
-    /**
-     * Simulate Symfony 2.8.
-     */
-    public function testSetTestClientPassHasAlias(): void
-    {
-        /* @see http://gianarb.it/blog/symfony-unit-test-controller-with-phpunit#expectations */
-        /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
-            ->getMock();
-
-        $container->expects($this->any())
-            ->method('getParameter')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->any())
-            ->method('hasDefinition')
-            ->will($this->returnValue(false));
-
-        $container->expects($this->once())
-            ->method('hasAlias')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->exactly(2))
-            ->method('setAlias')
-            ->will($this->returnValue(true));
-
-        $setTestClientPass = new SetTestClientPass($container);
-        $setTestClientPass->process($container);
-    }
-
     /**
      * Simulate a wrong environment.
      */
@@ -78,7 +48,7 @@ public function testSetTestClientPassElse(): void
             ->will($this->returnValue(false));
 
         try {
-            $setTestClientPass = new SetTestClientPass($container);
+            $setTestClientPass = new SetTestClientPass();
             $setTestClientPass->process($container);
         } catch (\Exception $e) {
             $this->assertSame(

diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
@@ -25,8 +25,8 @@ class ConfigurationTest extends WebTestCase
 
     public function setUp(): void
     {
-        static::$client = $this->makeClient();
-        $this->clientContainer = static::$client->getContainer();
+        $client = static::makeClient();
+        $this->clientContainer = $client->getContainer();
     }
 
     /**

diff --git a/tests/Test/WebTestCaseConfigLeanFrameworkTest.php b/tests/Test/WebTestCaseConfigLeanFrameworkTest.php
@@ -35,7 +35,7 @@ protected static function getKernelClass(): string
 
     public function testAssertStatusCode(): void
     {
-        $client = $this->makeClient();
+        $client = static::makeClient();
 
         $path = '/';
         $client->request('GET', $path);
@@ -45,7 +45,7 @@ public function testAssertStatusCode(): void
 
     public function testAssertValidationErrorsTriggersError(): void
     {
-        $client = $this->makeClient();
+        $client = static::makeClient();
 
         $path = '/form';
         $client->request('GET', $path);

diff --git a/tests/Test/WebTestCaseConfigTest.php b/tests/Test/WebTestCaseConfigTest.php
@@ -36,6 +36,9 @@
  */
 class WebTestCaseConfigTest extends WebTestCase
 {
+    /** @var \Symfony\Bundle\FrameworkBundle\Client client */
+    private $client = null;
+
     protected static function getKernelClass(): string
     {
         return AppConfigKernel::class;
@@ -48,16 +51,16 @@ public function testIndexAuthenticationArray(): void
     {
         $this->loadFixtures([]);
 
-        static::$client = $this->makeClient([
+        $this->client = static::makeClient([
             'username' => 'foobar',
             'password' => '12341234',
         ]);
 
         $path = '/';
 
-        $crawler = static::$client->request('GET', $path);
+        $crawler = $this->client->request('GET', $path);
 
-        $this->assertStatusCode(200, static::$client);
+        $this->assertStatusCode(200, $this->client);
 
         $this->assertSame(1,
             $crawler->filter('html > body')->count());
@@ -82,13 +85,13 @@ public function testIndexAuthenticationTrue(): void
     {
         $this->loadFixtures([]);
 
-        static::$client = $this->makeClient(true);
+        $this->client = static::makeClient(true);
 
         $path = '/';
 
-        $crawler = static::$client->request('GET', $path);
+        $crawler = $this->client->request('GET', $path);
 
-        $this->assertStatusCode(200, static::$client);
+        $this->assertStatusCode(200, $this->client);
 
         $this->assertSame(1,
             $crawler->filter('html > body')->count());
@@ -124,13 +127,13 @@ public function testIndexAuthenticationLoginAs(): void
             $loginAs
         );
 
-        static::$client = $this->makeClient();
+        $this->client = static::makeClient();
 
         $path = '/';
 
-        $crawler = static::$client->request('GET', $path);
+        $crawler = $this->client->request('GET', $path);
 
-        $this->assertStatusCode(200, static::$client);
+        $this->assertStatusCode(200, $this->client);
 
         $this->assertSame(1,
             $crawler->filter('html > body')->count());
@@ -168,12 +171,12 @@ public function testAllowedQueriesExceededException(): void
         $this->loginAs($repository->getReference('user'),
             'secured_area');
 
-        static::$client = $this->makeClient();
+        $this->client = static::makeClient();
 
         // One another query to load the second user.
         $path = '/user/2';
 
-        static::$client->request('GET', $path);
+        $this->client->request('GET', $path);
     }
 
     /**
@@ -191,12 +194,13 @@ public function testAnnotationAndException(): void
         $this->loadFixtures([
             'Liip\Acme\Tests\App\DataFixtures\ORM\LoadUserData',
         ]);
-        static::$client = $this->makeClient();
+
+        $this->client = static::makeClient();
 
         // One query to load the second user
         $path = '/user/1';
 
-        static::$client->request('GET', $path);
+        $this->client->request('GET', $path);
     }
 
     /**