Set to minimum PHP 8.1 Add Symfony 7 support

KnpLabs · Feb 25, 2024 · 64c49b5 · 64c49b5
1 parent 2b26634
commit 64c49b5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml
@@ -34,7 +34,7 @@ jobs:
             -   uses: actions/checkout@v4
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     extensions: pdo_sqlite, pdo_mysql, pdo_pgsql
                     coverage: none
 

diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml
@@ -15,7 +15,7 @@ jobs:
 
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     extensions: pdo_sqlite, pdo_mysql, pdo_pgsql
                     coverage: none
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,8 +7,8 @@ jobs:
     tests:
         strategy:
             matrix:
-                php:
-                    - 8.0
+                operating-system: [ ubuntu-latest ]
+                php-versions: [ '8.1', '8.3' ]
 
         name: Test ${{ matrix.php }}
         runs-on: ubuntu-latest

diff --git a/composer.json b/composer.json
@@ -11,18 +11,18 @@
         { "name": "Knplabs", "homepage": "http://knplabs.com" }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "doctrine/common": "^3.3",
         "doctrine/persistence": "^2.5|^3.0",
         "doctrine/dbal": "^3.3",
         "doctrine/orm": "^2.12",
         "doctrine/doctrine-bundle": "^2.7.2",
-        "symfony/cache": "^5.4|^6.0",
-        "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
-        "symfony/security-core": "^5.4|^6.0",
-        "symfony/framework-bundle": "^5.4|^6.0",
-        "symfony/string": "^5.4|^6.0",
+        "symfony/cache": "^6.0|^7.0",
+        "symfony/dependency-injection": "^6.0|^7.0",
+        "symfony/http-kernel": "^6.0|^7.0",
+        "symfony/security-bundle": "^6.0|^7.0",
+        "symfony/framework-bundle": "^6.0|^7.0",
+        "symfony/string": "^6.0|^7.0",
         "symfony/translation-contracts": "^2.4|^3.0",
         "nette/utils": "^3.2",
         "ramsey/uuid": "^4.2"
@@ -36,7 +36,7 @@
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpstan/phpstan": "^1.7.10",
         "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.18.5",
+        "rector/rector": "^1.0.0",
         "symplify/easy-coding-standard": "^10.2.9",
         "symplify/phpstan-extensions": "^10.2.9",
         "phpstan/phpstan-doctrine": "^1.3",

diff --git a/src/Provider/UserProvider.php b/src/Provider/UserProvider.php
@@ -5,8 +5,8 @@
 namespace Knp\DoctrineBehaviors\Provider;
 
 use Knp\DoctrineBehaviors\Contract\Provider\UserProviderInterface;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Security;
 
 final class UserProvider implements UserProviderInterface
 {

diff --git a/tests/config/config_test.php b/tests/config/config_test.php
@@ -9,8 +9,8 @@
 use Knp\DoctrineBehaviors\Tests\Provider\TestLocaleProvider;
 use Knp\DoctrineBehaviors\Tests\Provider\TestUserProvider;
 use Psr\Log\Test\TestLogger;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symfony\Component\Security\Core\Security;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 return static function (ContainerConfigurator $containerConfigurator): void {