Merge branch '3.2.x' into 3.3.x

* 3.2.x:
  Remove unnecessary empty line (#439)
  Test on PHP 8.2 and 8.3 (#515)
  Bump workflows (#514)
  Add static analysis files to .gitattributes

Author: derrabus

.gitattributes

@@ -7,4 +7,7 @@
 .gitignore export-ignore
 phpcs.xml.dist export-ignore
 phpstan.neon export-ignore
+phpstan.neon.dist export-ignore
 phpunit.xml.dist export-ignore
+psalm.xml export-ignore
+psalm-baseline.xml export-ignore

.github/workflows/coding-standards.yml

@@ -12,6 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
-    with:
-      php-version: "8.1"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

.github/workflows/continuous-integration.yml

@@ -12,6 +12,6 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@1.4.1"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.1.0"
     with:
-      php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
+      php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'

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

.github/workflows/static-analysis.yml

@@ -12,6 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
-    with:
-      php-version: "8.1"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

Resources/doc/index.rst

@@ -41,7 +41,6 @@ application:
 
     # config/packages/doctrine_migrations.yaml
 
-
     doctrine_migrations:
         # List of namespace/path pairs to search for migrations, at least one required
         migrations_paths:

phpstan.neon.dist

@@ -1,6 +1,6 @@
 parameters:
     level: 7
-    phpVersion: 80100
+    phpVersion: 80200
     paths:
         - %currentWorkingDirectory%/DependencyInjection
         - %currentWorkingDirectory%/Tests

psalm.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="4"
-    phpVersion="8.1"
+    phpVersion="8.2"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"