From 2bfb73143f3c3a8b2fc4cb7ab75ffe62a9758971 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Wed, 19 Jun 2024 11:01:21 +0200 Subject: [PATCH 1/3] Bump rector (#2453) --- composer.json | 2 +- src/Provider/Metadata.php | 2 +- src/Provider/MetadataInterface.php | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 807e8915a..3d86ca377 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,7 @@ "phpunit/phpunit": "^9.5", "psalm/plugin-phpunit": "^0.18", "psalm/plugin-symfony": "^5.0", - "rector/rector": "^0.19", + "rector/rector": "^1.1", "sonata-project/admin-bundle": "^4.28", "sonata-project/block-bundle": "^4.11 || ^5.0", "sonata-project/classification-bundle": "^4.0", diff --git a/src/Provider/Metadata.php b/src/Provider/Metadata.php index a216d366a..ecc17c936 100644 --- a/src/Provider/Metadata.php +++ b/src/Provider/Metadata.php @@ -55,7 +55,7 @@ public function getOptions(): array return $this->options; } - public function getOption(string $name, $default = null) + public function getOption(string $name, mixed $default = null) { return \array_key_exists($name, $this->options) ? $this->options[$name] : $default; } diff --git a/src/Provider/MetadataInterface.php b/src/Provider/MetadataInterface.php index 8e3e557fb..e2a7c857a 100644 --- a/src/Provider/MetadataInterface.php +++ b/src/Provider/MetadataInterface.php @@ -29,8 +29,6 @@ public function getDomain(): ?string; public function getOptions(): array; /** - * @param mixed $default The default value if option not found - * * @return mixed */ public function getOption(string $name, mixed $default = null); From 5036504a64df36a0f68fd5e1dd355a9905b87d06 Mon Sep 17 00:00:00 2001 From: Sonata CI Date: Wed, 19 Jun 2024 11:04:14 +0100 Subject: [PATCH 2/3] DevKit updates (#2454) --- .github/workflows/documentation.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/qa.yaml | 6 +++--- .github/workflows/symfony-lint.yaml | 8 ++++---- .github/workflows/test.yaml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 0a58c1427..20da58b91 100644 --- 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 index 8b77376bf..c04951065 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -35,7 +35,7 @@ jobs: extensions: mongodb, gd - 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 index 46eb68145..6e3d0937e 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -35,7 +35,7 @@ jobs: extensions: mongodb, gd - name: Install Composer dependencies (highest) - uses: ramsey/composer-install@v2 + uses: ramsey/composer-install@v3 with: dependency-versions: highest @@ -60,7 +60,7 @@ jobs: extensions: mongodb, gd - name: Install Composer dependencies (highest) - uses: ramsey/composer-install@v2 + uses: ramsey/composer-install@v3 with: dependency-versions: highest @@ -85,7 +85,7 @@ jobs: extensions: mongodb, gd - name: Install Composer dependencies (highest) - uses: ramsey/composer-install@v2 + uses: ramsey/composer-install@v3 with: dependency-versions: highest diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml index 2b1b5c82c..5beb969f3 100644 --- a/.github/workflows/symfony-lint.yaml +++ b/.github/workflows/symfony-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 @@ -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 @@ -106,7 +106,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 index 1c9dfa065..2f5598d9b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -90,7 +90,7 @@ 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 }} @@ -98,6 +98,6 @@ jobs: run: make coverage - name: Send coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: build/logs/clover.xml From 4a7ca4331cff56c31bd27ec5bcbf652885e8b4f0 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Wed, 19 Jun 2024 12:41:48 +0200 Subject: [PATCH 3/3] Solve usage of internal class (#2455) --- src/DependencyInjection/SonataMediaExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DependencyInjection/SonataMediaExtension.php b/src/DependencyInjection/SonataMediaExtension.php index 7d7574b4a..da667c1b4 100644 --- a/src/DependencyInjection/SonataMediaExtension.php +++ b/src/DependencyInjection/SonataMediaExtension.php @@ -22,10 +22,10 @@ use Symfony\Component\Config\Definition\Processor; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\Messenger\MessageBusInterface; /**