Merge pull request #1 from SBSEDV/symfony8

Add Symfony 8 support

Author: danielburger1337

.github/workflows/phpcsfixer.yaml

@@ -9,25 +9,24 @@ permissions:
 
 jobs:
     phpcsfixer:
-        runs-on: ${{ matrix.operating-system }}
+        runs-on: ubuntu-latest
 
         strategy:
             matrix:
-                operating-system: [ubuntu-latest]
-                php-versions: ["8.2"]
+                php_version: ["8.2"]
 
-        name: PHPCSFixer with PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
+        name: PHPCSFixer with PHP ${{ matrix.php_version }}
 
         steps:
             - uses: actions/checkout@v3
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: ${{ matrix.php-versions }}
+                  php-version: ${{ matrix.php_version }}
 
             - name: Install Composer packages
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+              run: composer install -q --no-ansi --no-interaction --prefer-dist
 
             - name: Run PHPCSFixer
               run: $GITHUB_WORKSPACE/vendor/bin/php-cs-fixer fix --dry-run

.github/workflows/phpstan.yaml

@@ -9,25 +9,24 @@ permissions:
 
 jobs:
     phpstan:
-        runs-on: ${{ matrix.operating-system }}
+        runs-on: ubuntu-latest
 
         strategy:
             matrix:
-                operating-system: [ubuntu-latest]
-                php-versions: ["8.2", "8.3", "8.4"]
+                php_version: ["8.2", "8.3", "8.4", "8.5"]
 
-        name: PHPStan with PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
+        name: PHPStan with PHP ${{ matrix.php_version }}
 
         steps:
             - uses: actions/checkout@v3
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: ${{ matrix.php-versions }}
+                  php-version: ${{ matrix.php_version }}
 
             - name: Install Composer packages
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+              run: composer install -q --no-ansi --no-interaction --prefer-dist
 
-            - name: Run PHPSTAN
+            - name: Run PHPStan
               run: $GITHUB_WORKSPACE/vendor/bin/phpstan --error-format=github

composer.json

@@ -16,17 +16,18 @@
     },
     "require": {
         "php": "^8.2",
-        "symfony/framework-bundle": "^7.0"
+        "symfony/framework-bundle": "^7.0 || ^8.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.89",
+        "monolog/monolog": "^3.5",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-symfony": "^2.0",
-        "symfony/http-client": "^7.0",
-        "symfony/monolog-bundle": "^3.6",
-        "symfony/twig-bundle": "^7.0",
-        "symfony/uid": "^7.0",
+        "symfony/http-client": "^7.0  || ^8.0",
+        "symfony/monolog-bundle": "^3.6 || ^4.0",
+        "symfony/twig-bundle": "^7.0 || ^8.0",
+        "symfony/uid": "^7.0 || ^8.0",
         "twig/twig": "^3.3"
     },
     "extra": {

src/Generator/RequestIdGenerator.php

@@ -11,6 +11,6 @@ public function __construct(
 
     public function createNewRequestId(): string
     {
-        return \substr(\bin2hex(\random_bytes((int) \ceil($this->length / 2))), 0, $this->length);  // @phpstan-ignore-line
+        return \substr(\bin2hex(\random_bytes((int) \ceil($this->length / 2))), 0, $this->length);  // @phpstan-ignore-line argument.type
     }
 }

src/Provider/RequestIdProvider.php

@@ -19,7 +19,7 @@ public function getCurrentRequestId(): string
             $this->reset();
         }
 
-        return $this->requestId; // @phpstan-ignore-line
+        return $this->requestId; // @phpstan-ignore-line return.type
     }
 
     public function setRequestId(string $requestId): void

src/Twig/HtmlErrorRendererDecorator.php

@@ -20,10 +20,6 @@ public function render(\Throwable $exception): FlattenException
 
         $html = $e->getAsString();
 
-        if (!\str_contains($html, '<body>')) {
-            return $e;
-        }
-
         $pos = \stripos($html, '</body>');
         if (false === $pos) {
             return $e;