Fix PHPStan issues

api-platform · Sep 2, 2019 · 4bf6c83 · 4bf6c83
1 parent c326387
commit 4bf6c83
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 15 deletions.
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/test.xml b/src/Bridge/Symfony/Bundle/Resources/config/test.xml
@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="test.api_platform.client" class="ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Client" public="true">
+        <service id="test.api_platform.client" class="ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Client" shared="false" public="true">
             <argument type="service" id="test.client" />
         </service>
     </services>

diff --git a/src/Bridge/Symfony/Bundle/Test/ApiTestCase.php b/src/Bridge/Symfony/Bundle/Test/ApiTestCase.php
@@ -28,9 +28,13 @@ abstract class ApiTestCase extends KernelTestCase
 {
     use ApiTestAssertionsTrait;
 
-    protected function doTearDown(): void
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown(): void
     {
-        parent::doTearDown();
+        parent::tearDown();
+
         self::getClient(null);
     }
 

diff --git a/src/Bridge/Symfony/Bundle/Test/Response.php b/src/Bridge/Symfony/Bundle/Test/Response.php
@@ -55,7 +55,7 @@ public function __construct(HttpFoundationResponse $httpFoundationResponse, Brow
             }
         }
 
-        $this->content = $httpFoundationResponse->getContent();
+        $this->content = (string) $httpFoundationResponse->getContent();
         $this->info = [
             'http_code' => $httpFoundationResponse->getStatusCode(),
             'error' => null,

diff --git a/tests/Fixtures/TestBundle/BrowserKit/Client.php b/tests/Fixtures/TestBundle/BrowserKit/Client.php
@@ -14,24 +14,47 @@
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\BrowserKit;
 
 use Symfony\Bundle\FrameworkBundle\Client as BaseClient;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Request as DomRequest;
 use Symfony\Component\HttpFoundation\Request;
 
-class Client extends BaseClient
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterRequest(DomRequest $request): Request
+if (class_exists(AbstractBrowser::class)) {
+    class Client extends KernelBrowser
     {
-        $request = parent::filterRequest($request);
+        /**
+         * {@inheritdoc}
+         */
+        protected function filterRequest(DomRequest $request): Request
+        {
+            $request = parent::filterRequest($request);
 
-        foreach ($request->headers->all() as $key => $value) {
-            if ([null] === $value) {
-                $request->headers->remove($key);
+            foreach ($request->headers->all() as $key => $value) {
+                if ([null] === $value) {
+                    $request->headers->remove($key);
+                }
             }
+
+            return $request;
         }
+    }
+} else {
+    class Client extends BaseClient
+    {
+        /**
+         * {@inheritdoc}
+         */
+        protected function filterRequest(DomRequest $request): Request
+        {
+            $request = parent::filterRequest($request);
 
-        return $request;
+            foreach ($request->headers->all() as $key => $value) {
+                if ([null] === $value) {
+                    $request->headers->remove($key);
+                }
+            }
+
+            return $request;
+        }
     }
 }