Merge pull request #873 from 5.1.1 into 5.2.x

Merge release 5.1.1 into 5.2.x

Author: GromNaN

.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.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.1.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.2.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.1.0"

.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.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -4,33 +4,15 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - config/**
+      - src/**
+      - phpstan*
+      - tests/StaticAnalysis/**
   push:
 
 jobs:
-  static-analysis-psalm:
-    name: "Static Analysis with Psalm"
-    runs-on: "ubuntu-20.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.2"
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v4"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "${{ matrix.php-version }}"
-
-      - name: "Set minimum-stability to stable in Composer"
-        run: "composer config minimum-stability stable"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
-
-      - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --php-version=${{ matrix.php-version }}"
+  static-analysis:
+    uses: "doctrine/.github/.github/workflows/[email protected]"

composer.json

@@ -29,7 +29,7 @@
         "composer-runtime-api": "^2.0",
         "doctrine/mongodb-odm": "^2.6",
         "doctrine/persistence": "^3.0",
-        "psr/log": "^2.0 || ^3.0",
+        "psr/log": "^1.0 || ^2.0 || ^3.0",
         "symfony/config": "^6.4 || ^7.0",
         "symfony/console": "^6.4 || ^7.0",
         "symfony/dependency-injection": "^6.4 || ^7.0",
@@ -39,18 +39,18 @@
         "symfony/options-resolver": "^6.4 || ^7.0"
     },
     "require-dev": {
+        "composer/semver": "^3.4",
         "doctrine/coding-standard": "^11.0",
         "doctrine/data-fixtures": "^1.8 || ^2.0",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^9.5.5",
-        "psalm/plugin-symfony": "^5.0",
         "symfony/browser-kit": "^6.4 || ^7.0",
         "symfony/form": "^6.4 || ^7.0",
         "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1",
         "symfony/security-bundle": "^6.4 || ^7.0",
         "symfony/stopwatch": "^6.4 || ^7.0",
         "symfony/validator": "^6.4 || ^7.0",
-        "symfony/yaml": "^6.4 || ^7.0",
-        "vimeo/psalm": "^5.25"
+        "symfony/yaml": "^6.4 || ^7.0"
     },
     "conflict": {
         "doctrine/data-fixtures": "<1.8 || >=3"