Merge 3.x into 4.x

sonata-project · Jun 20, 2024 · ffb0ba8 · ffb0ba8
2 parents 644dc1e + c86f2f2
commit ffb0ba8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -27,7 +27,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Set up Python 3.11
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: '3.11'
                   cache: 'pip'

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -34,7 +34,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -34,7 +34,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -58,7 +58,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -82,7 +82,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -83,14 +83,14 @@ jobs:
               run: composer require ${{ matrix.variant }} --no-update
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: ${{ matrix.dependencies }}
 
             - name: Run Tests with coverage
               run: make coverage
 
             - name: Send coverage to Codecov
-              uses: codecov/codecov-action@v3
+              uses: codecov/codecov-action@v4
               with:
                   files: build/logs/clover.xml
diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
-        "rector/rector": "^0.19",
+        "rector/rector": "^1.1",
         "symfony/console": "^5.4 || ^6.2 || ^7.0",
         "symfony/filesystem": "^5.4 || ^6.2 || ^7.0",
         "symfony/finder": "^5.4 || ^6.2 || ^7.0",

diff --git a/src/DependencyInjection/SonataSeoExtension.php b/src/DependencyInjection/SonataSeoExtension.php
@@ -18,9 +18,9 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.