Merge pull request #669 from alexislefebvre/chore-remove-compatibility-layers-for-Symfony-3-and-4

chore: remove compatibility layers for Symfony 3 and 4

Author: alexislefebvre

composer.json

@@ -37,9 +37,6 @@
         "symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0",
         "twig/twig": "^2.0 || ^3.8"
     },
-    "conflict": {
-        "symfony/framework-bundle": "4.3.0"
-    },
     "suggest": {
         "doctrine/annotations": "Required to use the @QueryCount(…) annotation",
         "liip/test-fixtures-bundle": "Efficient loading of Doctrine fixtures in functional test-cases for Symfony applications"

src/QueryCountClient.php

@@ -13,34 +13,29 @@
 
 namespace Liip\FunctionalTestBundle;
 
-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);
-}
-
-// Symfony <4.3.1 BC
-if (!class_exists(KernelBrowser::class)) {
-    class_alias(Client::class, KernelBrowser::class);
-}
-
-if (!class_exists(Client::class)) {
-    class_alias(KernelBrowser::class, Client::class);
-}
+use Symfony\Component\DomCrawler\Crawler;
 
 class QueryCountClient extends KernelBrowser
 {
-    /*
-     * We use trait only because of Client::request signature strict type mismatch between Symfony 3 and 4.
-     */
-    use QueryCountClientTrait;
-
     /** @var QueryCounter */
     private $queryCounter;
 
+    public function request(
+        string $method,
+        string $uri,
+        array $parameters = [],
+        array $files = [],
+        array $server = [],
+        ?string $content = null,
+        bool $changeHistory = true
+    ): Crawler {
+        $crawler = parent::request($method, $uri, $parameters, $files, $server, $content, $changeHistory);
+        $this->checkQueryCount();
+
+        return $crawler;
+    }
+
     public function setQueryCounter(QueryCounter $queryCounter): void
     {
         $this->queryCounter = $queryCounter;