Skip to content

Commit 124bbaa

Browse files
authored
Merge branch '0.3' into feature/remove-deprecations
2 parents d2fcf0b + 41dc635 commit 124bbaa

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818

1919
services:
2020
mongodb_primary:
21-
image: mongo:7-jammy
21+
image: mongo:8
2222
env:
2323
MONGO_INITDB_ROOT_USERNAME: "primary"
2424
MONGO_INITDB_ROOT_PASSWORD: "password"
2525
ports:
2626
- "27017:27017"
2727
mongodb_secondary:
28-
image: mongo:7-jammy
28+
image: mongo:8
2929
env:
3030
MONGO_INITDB_ROOT_USERNAME: "secondary"
3131
MONGO_INITDB_ROOT_PASSWORD: "password"
@@ -45,6 +45,7 @@ jobs:
4545
- '8.1'
4646
- '8.2'
4747
- '8.3'
48+
- '8.4'
4849
dependencies:
4950
- 'highest'
5051
- 'lowest'
@@ -79,7 +80,7 @@ jobs:
7980
run: composer require ${{ matrix.variant }} --no-update
8081

8182
- name: Install Composer dependencies (${{ matrix.dependencies }})
82-
uses: ramsey/composer-install@v2
83+
uses: ramsey/composer-install@v3
8384
with:
8485
dependency-versions: ${{ matrix.dependencies }}
8586

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,24 @@
1313
],
1414
"require": {
1515
"php": ">=8.1",
16+
"ext-mongodb": "^1.21",
1617
"mongodb/mongodb": "^1.21",
1718
"symfony/config": "^6.3 || ^7.0",
1819
"symfony/console": "^6.3 || ^7.0",
1920
"symfony/dependency-injection": "^6.3.5 || ^7.0",
2021
"symfony/http-kernel": "^6.3.5 || ^7.0",
21-
"symfony/runtime": "^6.3 || ^7.0"
22+
"symfony/runtime": "^6.4.14 || ^7.1.7"
2223
},
2324
"require-dev": {
2425
"doctrine/coding-standard": "^12.0",
25-
"rector/rector": "^0.18",
26+
"rector/rector": "^2.0",
2627
"symfony/browser-kit": "^6.3 || ^7.0",
2728
"symfony/filesystem": "^6.3 || ^7.0",
2829
"symfony/framework-bundle": "^6.3.5 || ^7.0",
2930
"symfony/phpunit-bridge": "~6.3.10 || ^6.4.1 || ^7.0.1",
3031
"symfony/stopwatch": "^6.3 || ^7.0",
31-
"symfony/yaml": "^6.3 || ^7.0",
3232
"symfony/web-profiler-bundle": "^6.3 || ^7.0",
33+
"symfony/yaml": "^6.3 || ^7.0",
3334
"zenstruck/browser": "^1.6"
3435
},
3536
"scripts": {

rector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020

2121
use Rector\Config\RectorConfig;
22-
use Rector\Core\ValueObject\PhpVersion;
2322
use Rector\Set\ValueObject\LevelSetList;
2423
use Rector\Set\ValueObject\SetList;
24+
use Rector\ValueObject\PhpVersion;
2525

2626
return static function (RectorConfig $rectorConfig): void {
2727
$rectorConfig->parallel();

src/DataCollector/MongoDBDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function lateCollect(): void
8383
(array) $client->getManager()->executeCommand('admin', new Command(['buildInfo' => 1]))->toArray()[0],
8484
['versionArray' => 0, 'ok' => 0],
8585
),
86-
'clientInfo' => array_diff_key($client->__debugInfo(), ['manager' => 0]),
86+
'clientInfo' => array_diff_key($client->__debugInfo(), ['manager' => 0, 'builderEncoder' => 0]),
8787
];
8888
}
8989

src/MongoDBBundle.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
namespace MongoDB\Bundle;
2222

23+
use MongoDB\Bundle\DependencyInjection\Compiler\DataCollectorPass;
2324
use MongoDB\Bundle\DependencyInjection\MongoDBExtension;
2425
use Symfony\Component\DependencyInjection\ContainerBuilder;
2526
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -34,6 +35,6 @@ public function getContainerExtension(): ?ExtensionInterface
3435

3536
public function build(ContainerBuilder $container): void
3637
{
37-
$container->addCompilerPass(new DependencyInjection\Compiler\DataCollectorPass());
38+
$container->addCompilerPass(new DataCollectorPass());
3839
}
3940
}

0 commit comments

Comments
 (0)