From 90781a2176c15b3fee370b6d07464ec69e71c6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Mon, 4 Aug 2025 21:53:41 +0200 Subject: [PATCH 1/3] Support Symfony 8 --- .github/workflows/test.yaml | 17 +++++++++-------- composer.json | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fd4c4e8..bd437da 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -31,22 +31,21 @@ jobs: strategy: matrix: php-version: - - '8.1' - - '8.2' - - '8.3' + - '8.4' symfony-version: - '5.4.*' - - '6.0.*' - - '6.1.*' - - '6.2.*' - - '6.3.*' + - '6.4.*' + - '7.4.*' + - '8.0.*' include: - php-version: '8.0' symfony-version: '5.4.*' - php-version: '8.2' symfony-version: '6.4.*' - php-version: '8.2' - symfony-version: '7.0.*' + symfony-version: '7.4.*' + - php-version: '8.4' + symfony-version: '8.0.*' steps: - name: Checkout code @@ -66,6 +65,8 @@ jobs: - name: Install Composer dependencies uses: ramsey/composer-install@v2 + with: + dependency-versions: highest - name: Run PHPUnit run: vendor/bin/simple-phpunit diff --git a/composer.json b/composer.json index 9c11cb6..6f01cce 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,11 @@ "require": { "php": ">=8.0", "league/flysystem": "^3.0", - "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/config": "^5.4 || ^6.0 || ^7.0 || ^8.0", "symfony/deprecation-contracts": "^2.1 || ^3", - "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", - "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", - "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0" + "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0 || ^8.0" }, "require-dev": { "doctrine/mongodb-odm": "^2.0", @@ -47,10 +47,10 @@ "league/flysystem-sftp-v3": "^3.1", "league/flysystem-webdav": "^3.29", "platformcommunity/flysystem-bunnycdn": "^3.3", - "symfony/dotenv": "^5.4 || ^6.0 || ^7.0", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0", - "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0" + "symfony/dotenv": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0 || ^8.0", }, "config": { "preferred-install": { @@ -58,5 +58,6 @@ }, "sort-packages": true }, - "minimum-stability": "beta" + "minimum-stability": "dev", + "prefer-stable": false } From e8ae767184f15941bf2b4a883fd9318a905e21a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Thu, 7 Aug 2025 10:05:30 +0200 Subject: [PATCH 2/3] Skip MongoDB ODM tests while it doesn't support Symfony 8 --- .github/workflows/test.yaml | 11 +++++++---- composer.json | 2 +- .../Builder/GridFSAdapterDefinitionBuilderTest.php | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bd437da..f0bd665 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,6 +35,7 @@ jobs: symfony-version: - '5.4.*' - '6.4.*' + - '7.3.*' - '7.4.*' - '8.0.*' include: @@ -43,10 +44,7 @@ jobs: - php-version: '8.2' symfony-version: '6.4.*' - php-version: '8.2' - symfony-version: '7.4.*' - - php-version: '8.4' - symfony-version: '8.0.*' - + symfony-version: '7.3.*' steps: - name: Checkout code uses: actions/checkout@v4 @@ -63,6 +61,11 @@ jobs: composer config --global --no-plugins allow-plugins.symfony/flex true composer global require --no-progress --no-scripts --no-plugins symfony/flex + - name: Remove incompatible packages + if: matrix.symfony-version == '8.0.*' + run: | + composer remove --no-update --dev doctrine/mongodb-odm + - name: Install Composer dependencies uses: ramsey/composer-install@v2 with: diff --git a/composer.json b/composer.json index 6f01cce..6f69375 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "symfony/dotenv": "^5.4 || ^6.0 || ^7.0 || ^8.0", "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0", "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0 || ^8.0" }, "config": { "preferred-install": { diff --git a/tests/Adapter/Builder/GridFSAdapterDefinitionBuilderTest.php b/tests/Adapter/Builder/GridFSAdapterDefinitionBuilderTest.php index 91c361b..8da4646 100644 --- a/tests/Adapter/Builder/GridFSAdapterDefinitionBuilderTest.php +++ b/tests/Adapter/Builder/GridFSAdapterDefinitionBuilderTest.php @@ -98,6 +98,10 @@ public function testInvalidOptions(array $options, string $message): void public function testInitializeBucketFromDocumentManager(): void { + if (!class_exists(DocumentManager::class)) { + self::markTestSkipped('Doctrine ODM is not installed, skipping test.'); + } + $client = new Client(); $config = new Configuration(); $config->setDefaultDB('testing'); From ef56c4f2e9249e050d13f68511a26873c0bce3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Thu, 7 Aug 2025 10:11:29 +0200 Subject: [PATCH 3/3] MongoDB extension 2 is now supported --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f0bd665..e30df5e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -54,7 +54,6 @@ jobs: with: coverage: none php-version: ${{ matrix.php-version }} - extensions: mongodb-1.21.0 - name: Install Symfony Flex run: |