Merge pull request #861 from doctrine/5.0.x-merge-up-into-5.1.x_NmsNxPg0

Merge release 5.0.2 into 5.1.x

Author: alcaeus

.github/workflows/coding-standards.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"

.github/workflows/composer-lint.yml

@@ -15,4 +15,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.2.0"

.github/workflows/continuous-integration.yml

@@ -95,7 +95,7 @@ jobs:
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v4"
         with:
-          name: "phpunit-${{ matrix.php-version }}-${{ hashFiles(composer.lock) }}.coverage"
+          name: "phpunit-${{ matrix.php-version }}-${{ hashFiles('composer.lock') }}.coverage"
           path: "coverage.xml"
 
   upload_coverage:

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

README.markdown

@@ -14,7 +14,7 @@ Compatibility
 
 The current version of this bundle has the following requirements:
  * PHP 8.1 or newer is required
- * `ext-mongodb` 1.5 or newer
+ * `ext-mongodb` 1.16 or newer
  * Symfony 6.4 or newer is required
 
 Support for older Symfony, PHP and MongoDB versions is provided via the `4.7.x`

composer.json

@@ -25,7 +25,7 @@
     "homepage": "http://www.doctrine-project.org",
     "require": {
         "php": "^8.1",
-        "ext-mongodb": "^1.5",
+        "ext-mongodb": "^1.16",
         "composer-runtime-api": "^2.0",
         "doctrine/mongodb-odm": "^2.6",
         "doctrine/persistence": "^3.0",
@@ -50,7 +50,7 @@
         "symfony/stopwatch": "^6.4 || ^7.0",
         "symfony/validator": "^6.4 || ^7.0",
         "symfony/yaml": "^6.4 || ^7.0",
-        "vimeo/psalm": "^5.12"
+        "vimeo/psalm": "^5.25"
     },
     "conflict": {
         "doctrine/data-fixtures": "<1.3"

src/DataCollector/CommandDataCollector.php

@@ -6,6 +6,7 @@
 
 use Doctrine\ODM\MongoDB\APM\Command;
 use Doctrine\ODM\MongoDB\APM\CommandLogger;
+use MongoDB\BSON\Document;
 use stdClass;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -16,8 +17,6 @@
 use function array_reduce;
 use function count;
 use function json_decode;
-use function MongoDB\BSON\fromPHP;
-use function MongoDB\BSON\toCanonicalExtendedJSON;
 
 /** @internal */
 final class CommandDataCollector extends DataCollector
@@ -33,10 +32,11 @@ public function collect(Request $request, Response $response, ?Throwable $except
             'commands' => array_map(
                 static function (Command $command): array {
                     $dbProperty = '$db';
+                    $document   = Document::fromPHP($command->getCommand());
 
                     return [
                         'database' => $command->getCommand()->$dbProperty ?? '',
-                        'command' => json_decode(toCanonicalExtendedJSON(fromPHP($command->getCommand()))),
+                        'command' => json_decode($document->toCanonicalExtendedJSON()),
                         'durationMicros' => $command->getDurationMicros(),
                     ];
                 },