From 6a20101b87a4871a9c010f3705d0063f66dc90ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Fri, 30 Aug 2024 11:33:48 +0200 Subject: [PATCH 1/6] Remove unused psalm baseline entry (#851) --- composer.json | 2 +- psalm-baseline.xml | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 14ac3064..626c5655 100644 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 8532853d..32058c25 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + @@ -21,12 +21,6 @@ - - - - - - From 0642b8bcc994de379b3f0e51c62e0ebb86dceb67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:08:43 +0200 Subject: [PATCH 2/6] Bump doctrine/.github from 5.0.1 to 5.1.0 (#854) Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/5.0.1...5.1.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/composer-lint.yml | 2 +- .github/workflows/release-on-milestone-closed.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 81415312..be6c2557 100644 --- a/.github/workflows/coding-standards.yml +++ b/.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.1.0" diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index aff94ca5..ce49a02a 100644 --- a/.github/workflows/composer-lint.yml +++ b/.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.1.0" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index e81871a4..11d81464 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.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.1.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} From fdc40f3676220a185661f9fcee3b0f3eba4f5f93 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 30 Sep 2024 14:51:33 +0300 Subject: [PATCH 3/6] Fix deprecations in CommandDataCollector (#856) * Fix deprecations in CommandDataCollector * Fix spaces --- composer.json | 2 +- src/DataCollector/CommandDataCollector.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 626c5655..929c2ab0 100644 --- a/composer.json +++ b/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", diff --git a/src/DataCollector/CommandDataCollector.php b/src/DataCollector/CommandDataCollector.php index cade11ca..7530d8a5 100644 --- a/src/DataCollector/CommandDataCollector.php +++ b/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(), ]; }, From cadbe00d6ee1a376f7a58d3559d3e7907adad1c6 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 30 Sep 2024 14:36:42 +0200 Subject: [PATCH 4/6] Fix invalid expression in CI workflow (#857) --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 0a99034b..074f65cc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.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: From ece33444c71e674982953973f608ea701b2ae912 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 1 Oct 2024 09:58:26 +0300 Subject: [PATCH 5/6] Fix ext-mongodb version in README.markdown (#858) --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 25a7180c..6ed98079 100644 --- a/README.markdown +++ b/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` From d891c8da192629cf3b81490ed24e852d8af6c959 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 18:34:36 +0800 Subject: [PATCH 6/6] Bump doctrine/.github from 5.1.0 to 5.2.0 (#859) Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/5.1.0...5.2.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/composer-lint.yml | 2 +- .github/workflows/release-on-milestone-closed.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index be6c2557..dd7f14f7 100644 --- a/.github/workflows/coding-standards.yml +++ b/.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.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0" diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index ce49a02a..c6c88e31 100644 --- a/.github/workflows/composer-lint.yml +++ b/.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.1.0" + uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.2.0" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 11d81464..2478d38d 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.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.1.0" + 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 }}