Merge branch '1.x' into dependabot/composer/vimeo/psalm-5.23.1

.github/pull_request_template.md

@@ -1,11 +1,9 @@
-| Q             | A                                                                  |
-|---------------|--------------------------------------------------------------------|
-| Branch?       | 1.x or main for bc <!-- see below -->                              |
-| Bug fix?      | yes/no                                                             |
-| New feature?  | yes/no <!-- please update /CHANGELOG.md files -->                  |
-| Deprecations? | yes/no <!-- please update UPGRADE-*.md and /CHANGELOG.md files --> |
-| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", -->           |
-| License       | MIT                                                                |
+| Q             | A                                                                    |
+|---------------|----------------------------------------------------------------------|
+| Branch?       | 1.x or main for bc <!-- see below -->                                |
+| Deprecations? | yes/no <!-- please update UPGRADE-2.0.md and /CHANGELOG.md files --> |
+| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", -->             |
+| License       | MIT                                                                  |
 
 <!--
 Replace this notice with a short README for your feature/bugfix.

.github/workflows/ci.yml

@@ -1,69 +1,38 @@
-name: "Continuous Integration"
-
+name: CI
 on: [ push, pull_request ]
-
 jobs:
-  tests:
-    name: "🧪 Tests"
-
+  ci:
+    name: "CI"
     runs-on: ${{ matrix.operating-system }}
-
     strategy:
       matrix:
-        dependencies:
-          - "locked"
-        php-version:
-          - "8.0"
-          - "8.1"
-          - "8.2"
-        operating-system:
-          - "ubuntu-latest"
-          - "windows-latest"
-          - "macos-latest"
-
+        operating-system: [ ubuntu-latest, windows-latest, macos-latest ]
+        php-version: [ 8.0, 8.3 ]
     steps:
+
+      # --------- Setup steps ---------
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: actions/checkout@v3
 
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
-          extensions: sodium, fileinfo
+          extensions: pcov, xdebug, sodium, fileinfo
 
       - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
-        with:
-          dependency-versions: "${{ matrix.dependencies }}"
+        uses: ramsey/composer-install@v2
 
-      - name: "Run tests"
+      # --------- Run steps ---------
+      - name: "Unit Tests"
         run: "composer test"
 
-  code-quality:
-    name: "🔬 Check code quality"
-    needs: tests
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v3"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "pcov"
-          php-version: "8.0"
-          ini-values: memory_limit=-1
-          extensions: sodium, fileinfo
-
-      - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
-        with:
-          dependency-versions: "locked"
+      - name: "Coding Style"
+        run: "composer cs-check"
+        if: matrix.operating-system == 'ubuntu-latest'
 
-      - name: "Psalm"
+      - name: "Static code analysis"
         run: "composer psalm"
-
-      - name: "Cs Fixer"
-        run: "composer cs-check"
+        if: matrix.operating-system == 'ubuntu-latest'