Skip to content

Commit b142136

Browse files
authored
Merge pull request #188 from GromNaN/symfony8
feat: Support Symfony 8
2 parents 3e0a25b + 90604b7 commit b142136

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

.github/workflows/test.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,20 @@ jobs:
3131
strategy:
3232
matrix:
3333
php-version:
34-
- '8.1'
35-
- '8.2'
36-
- '8.3'
34+
- '8.4'
3735
symfony-version:
3836
- '5.4.*'
39-
- '6.0.*'
40-
- '6.1.*'
41-
- '6.2.*'
42-
- '6.3.*'
37+
- '6.4.*'
38+
- '7.3.*'
39+
- '7.4.*'
40+
- '8.0.*'
4341
include:
4442
- php-version: '8.0'
4543
symfony-version: '5.4.*'
4644
- php-version: '8.2'
4745
symfony-version: '6.4.*'
4846
- php-version: '8.2'
49-
symfony-version: '7.0.*'
50-
47+
symfony-version: '7.3.*'
5148
steps:
5249
- name: Checkout code
5350
uses: actions/checkout@v4
@@ -59,8 +56,15 @@ jobs:
5956
php-version: ${{ matrix.php-version }}
6057
tools: flex
6158

59+
- name: Remove incompatible packages
60+
if: matrix.symfony-version == '8.0.*'
61+
run: |
62+
composer remove --no-update --dev doctrine/mongodb-odm
63+
6264
- name: Install Composer dependencies
6365
uses: ramsey/composer-install@v2
66+
with:
67+
dependency-versions: highest
6468

6569
- name: Run PHPUnit
6670
run: vendor/bin/simple-phpunit

composer.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"require": {
2929
"php": ">=8.0",
3030
"league/flysystem": "^3.0",
31-
"symfony/config": "^5.4 || ^6.0 || ^7.0",
31+
"symfony/config": "^5.4 || ^6.0 || ^7.0 || ^8.0",
3232
"symfony/deprecation-contracts": "^2.1 || ^3",
33-
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
34-
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
35-
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
33+
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0",
34+
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0",
35+
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0 || ^8.0"
3636
},
3737
"require-dev": {
3838
"doctrine/mongodb-odm": "^2.0",
@@ -47,16 +47,17 @@
4747
"league/flysystem-sftp-v3": "^3.1",
4848
"league/flysystem-webdav": "^3.29",
4949
"platformcommunity/flysystem-bunnycdn": "^3.3",
50-
"symfony/dotenv": "^5.4 || ^6.0 || ^7.0",
51-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
52-
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
53-
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0"
50+
"symfony/dotenv": "^5.4 || ^6.0 || ^7.0 || ^8.0",
51+
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
52+
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0",
53+
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0 || ^8.0"
5454
},
5555
"config": {
5656
"preferred-install": {
5757
"*": "dist"
5858
},
5959
"sort-packages": true
6060
},
61-
"minimum-stability": "beta"
61+
"minimum-stability": "dev",
62+
"prefer-stable": false
6263
}

tests/Adapter/Builder/GridFSAdapterDefinitionBuilderTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ public function testInvalidOptions(array $options, string $message): void
9898

9999
public function testInitializeBucketFromDocumentManager(): void
100100
{
101+
if (!class_exists(DocumentManager::class)) {
102+
self::markTestSkipped('Doctrine ODM is not installed, skipping test.');
103+
}
104+
101105
$client = new Client();
102106
$config = new Configuration();
103107
$config->setDefaultDB('testing');

0 commit comments

Comments
 (0)