Remove support for SF4

Author: loevgaard

.github/workflows/build.yaml

@@ -65,7 +65,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "~4.4.0"
                     - "~5.4.0"
                     - "~6.4.0"
                     - "~7.0.0"
@@ -124,7 +123,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "~4.4.0"
                     - "~5.4.0"
                     - "~6.4.0"
                     - "~7.0.0"
@@ -183,7 +181,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "~4.4.0"
                     - "~5.4.0"
                     - "~6.4.0"
                     - "~7.0.0"

composer.json

@@ -11,11 +11,10 @@
     ],
     "require": {
         "php": ">=7.4",
-        "setono/symfony-main-request-trait": "^1.0",
-        "symfony/config": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-        "symfony/http-foundation": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-        "symfony/http-kernel": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+        "symfony/config": "^5.4 || ^6.4 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
+        "symfony/http-foundation": "^5.4 || ^6.4 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
         "twig/twig": "^2.14 || ^3.4"
     },
     "require-dev": {
@@ -28,8 +27,8 @@
         "psalm/plugin-phpunit": "^0.18",
         "setono/code-quality-pack": "^2.4",
         "shipmonk/composer-dependency-analyser": "^1.8",
-        "symfony/console": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-        "symfony/yaml": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+        "symfony/console": "^5.4 || ^6.4 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.4 || ^7.0",
         "webmozart/assert": "^1.11"
     },
     "prefer-stable": true,

psalm.xml

@@ -4,6 +4,10 @@
     errorLevel="1"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="false"
+    findUnusedCode="false"
+    findUnusedPsalmSuppress="true"
+    findUnusedVariablesAndParams="false"
     phpVersion="8.1"
 >
     <projectFiles>

src/BotDetector/BotDetector.php

@@ -4,14 +4,11 @@
 
 namespace Setono\BotDetectionBundle\BotDetector;
 
-use Setono\MainRequestTrait\MainRequestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 final class BotDetector implements BotDetectorInterface
 {
-    use MainRequestTrait;
-
     /** @var array<string, bool> */
     private array $cache = [];
 
@@ -56,11 +53,9 @@ public function isBot(string $userAgent): bool
 
     public function isBotRequest(Request $request = null): bool
     {
+        $request = $request ?? $this->requestStack->getMainRequest();
         if (null === $request) {
-            $request = $this->getMainRequestFromRequestStack($this->requestStack);
-            if (null === $request) {
-                return false;
-            }
+            return false;
         }
 
         $userAgent = $request->headers->get('user-agent');