From 5fee11308b11eafab70bc323fe332176f2daa37a Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Thu, 11 Dec 2025 20:33:57 +0100
Subject: [PATCH 1/2] chore: remove compatibility layers for Symfony 3 and 4

---
 src/QueryCountClient.php              | 37 +++++++++++--------------
 src/QueryCountClientSymfony3Trait.php | 37 -------------------------
 src/QueryCountClientTrait.php         | 39 ---------------------------
 3 files changed, 16 insertions(+), 97 deletions(-)
 delete mode 100644 src/QueryCountClientSymfony3Trait.php
 delete mode 100644 src/QueryCountClientTrait.php

diff --git a/src/QueryCountClient.php b/src/QueryCountClient.php
index 06bec015..46652709 100644
--- a/src/QueryCountClient.php
+++ b/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;
diff --git a/src/QueryCountClientSymfony3Trait.php b/src/QueryCountClientSymfony3Trait.php
deleted file mode 100644
index 25f9818f..00000000
--- a/src/QueryCountClientSymfony3Trait.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the Liip/FunctionalTestBundle
- *
- * (c) Lukas Kahwe Smith <smith@pooteeweet.org>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Liip\FunctionalTestBundle;
-
-/**
- * @author Sullivan Senechal <soullivaneuh@gmail.com>
- *
- * @internal
- */
-trait QueryCountClientSymfony3Trait
-{
-    public function request(
-        $method,
-        $uri,
-        array $parameters = [],
-        array $files = [],
-        array $server = [],
-        $content = null,
-        $changeHistory = true
-    ) {
-        $crawler = parent::request($method, $uri, $parameters, $files, $server, $content, $changeHistory);
-        $this->checkQueryCount();
-
-        return $crawler;
-    }
-}
diff --git a/src/QueryCountClientTrait.php b/src/QueryCountClientTrait.php
deleted file mode 100644
index 611aa537..00000000
--- a/src/QueryCountClientTrait.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the Liip/FunctionalTestBundle
- *
- * (c) Lukas Kahwe Smith <smith@pooteeweet.org>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Liip\FunctionalTestBundle;
-
-use Symfony\Component\DomCrawler\Crawler;
-
-/**
- * @author Sullivan Senechal <soullivaneuh@gmail.com>
- *
- * @internal
- */
-trait QueryCountClientTrait
-{
-    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;
-    }
-}

From 8d9349e72035e2df21a8e6e053e7197cbfc9551e Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Thu, 11 Dec 2025 21:02:20 +0100
Subject: [PATCH 2/2] deps: remove conflict with symfony/framework-bundle
 4.3.0,
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

it can’t be installed
---
 composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composer.json b/composer.json
index 75c92d0d..b9ec47f5 100644
--- a/composer.json
+++ b/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"