Merge remote-tracking branch 'origin/2.1'

Author: dbu

CHANGELOG.md

@@ -3,10 +3,17 @@ Changelog
 
 3.0.0 (unreleased)
 ------------------
+
 * **2019-02-28**: [BC-BREAK] Remove `DatabaseTestListener`, use scripts in `bin/make/` to ramp up your testing environment for several test suites
 * **2019-02-28**: [BC-BREAK] Introduce PHPUnit 6 Support, Remove PHPUnit 5.7.
 * **2019-02-28**: Add testing scenarios for Symfony 4.2 and 4.3 (allowed to fail for now)
 
+2.1.12
+------
+
+* **2019-07-26**: Work around name collision with Symfony 4.3.
+  `BaseTestCase::getClient` is deprecated, use `BaseTestCase::getFrameworkBundleClient` instead.
+
 2.1.0
 -----
 

phpunit.xml.dist

@@ -12,4 +12,8 @@
 		</testsuite>
 	</testsuites>
 
+    <listeners>
+       <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+    </listeners>
+
 </phpunit>

src/Functional/BaseTestCase.php

@@ -54,12 +54,26 @@ protected function getKernelConfiguration()
         return [];
     }
 
+    public function __call($name, $arguments)
+    {
+        if ('getClient' === $name) {
+            @trigger_error(sprintf(
+                '"%s::getClient()" is deprecated in favor of getFrameworkBundleClient() since symfony-cmf/testing 2.1 and will no longer be callable in 3.0',
+                __CLASS__
+            ), E_USER_DEPRECATED);
+
+            return $this->getFrameworkBundleClient();
+        }
+
+        return parent::$name(...$arguments);
+    }
+
     /**
      * Gets the Client.
      *
      * @return Client
      */
-    public function getClient()
+    public function getFrameworkBundleClient()
     {
         if (null === $this->client) {
             $this->client = $this->createClient($this->getKernelConfiguration());

tests/Functional/BaseTestCaseTest.php

@@ -77,6 +77,20 @@ public function provideTestDb()
         ];
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation "Symfony\Cmf\Component\Testing\Functional\BaseTestCase::getClient()" is deprecated in favor of getFrameworkBundleClient() since symfony-cmf/testing 2.1 and will no longer be callable in 3.0
+     */
+    public function testItTriggersADeprecationErrorWhenCallingGetClient()
+    {
+        $this->assertInstanceOf(Client::class, $this->testCase->getClient());
+    }
+
+    public function testItCanProvideAFrameworkBundleClient()
+    {
+        $this->assertInstanceOf(Client::class, $this->testCase->getFrameworkBundleClient());
+    }
+
     /**
      * @dataProvider provideTestDb
      * @depends testGetContainer