From 2fbfe9b1fd7f09ccc3f15873b616d7a52aabd64c Mon Sep 17 00:00:00 2001 From: SonataCI Date: Tue, 23 Jan 2024 16:12:04 +0000 Subject: [PATCH 1/2] DevKit updates --- .github/workflows/documentation.yaml | 4 ++-- .github/workflows/lint.yaml | 12 ++++++------ .github/workflows/qa.yaml | 14 +++++++------- .github/workflows/symfony-lint.yaml | 16 ++++++++-------- .github/workflows/test.yaml | 4 ++-- Makefile | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 27f5ff7a..0a58c142 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3.11 uses: actions/setup-python@v4 @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run DOCtor-RST uses: docker://oskarstark/doctor-rst diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index eab97115..568d0d70 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -24,12 +24,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 extensions: mongodb @@ -49,12 +49,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2, composer-normalize:2 env: @@ -70,7 +70,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install yamllint run: sudo apt-get install yamllint @@ -85,7 +85,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required dependencies run: sudo apt-get update && sudo apt-get install libxml2-utils diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index bd7d81d4..d972f174 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -24,12 +24,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 extensions: mongodb @@ -49,12 +49,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 extensions: mongodb @@ -65,7 +65,7 @@ jobs: dependency-versions: highest - name: Psalm - run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.2 + run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.3 rector: name: Rector @@ -74,12 +74,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 extensions: mongodb diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml index 8291ee22..2b1b5c82 100644 --- a/.github/workflows/symfony-lint.yaml +++ b/.github/workflows/symfony-lint.yaml @@ -24,12 +24,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 @@ -48,12 +48,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 @@ -72,12 +72,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 @@ -96,12 +96,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 47d0fb4b..349241d5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -64,7 +64,7 @@ jobs: allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - - php-version: '8.2' + - php-version: '8.3' dependencies: highest allowed-to-fail: false symfony-require: 7.0.* @@ -72,7 +72,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 diff --git a/Makefile b/Makefile index 420682c4..a5e077dd 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ phpstan: .PHONY: phpstan psalm: - vendor/bin/psalm --php-version=8.2 + vendor/bin/psalm --php-version=8.3 .PHONY: psalm rector: From 44e031d4e4608291dfc3ab9293a1eaab81fd5465 Mon Sep 17 00:00:00 2001 From: Fran Moreno Date: Tue, 23 Jan 2024 17:13:57 +0100 Subject: [PATCH 2/2] Fix test reference --- .../SonataDoctrineMongoDBAdminExtensionTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/DependencyInjection/SonataDoctrineMongoDBAdminExtensionTest.php b/tests/DependencyInjection/SonataDoctrineMongoDBAdminExtensionTest.php index 3f438d9e..a16a2806 100644 --- a/tests/DependencyInjection/SonataDoctrineMongoDBAdminExtensionTest.php +++ b/tests/DependencyInjection/SonataDoctrineMongoDBAdminExtensionTest.php @@ -15,6 +15,7 @@ use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase; use Sonata\DoctrineMongoDBAdminBundle\DependencyInjection\SonataDoctrineMongoDBAdminExtension; +use Symfony\Component\DependencyInjection\Reference; final class SonataDoctrineMongoDBAdminExtensionTest extends AbstractExtensionTestCase { @@ -52,7 +53,7 @@ public function testEntityManagerSetFactory(): void $this->assertContainerBuilderHasServiceDefinitionWithArgument( 'sonata.admin.manipulator.acl.object.doctrine_mongodb', 0, - 'doctrine_mongodb' + new Reference('doctrine_mongodb') ); }