Catchup with upstream

.gitattributes

@@ -4,7 +4,9 @@
 /.gitignore export-ignore
 /.phive/ export-ignore
 /CODE_OF_CONDUCT.md export-ignore
+/CONTRIBUTING.md export-ignore
 /bin/ export-ignore
 /config/ export-ignore
+/docs/ export-ignore
 /phpunit.xml export-ignore
 /tests/ export-ignore

.github/dependabot.yml

@@ -6,11 +6,24 @@ updates:
       directory: "/"
       schedule:
           interval: "daily"
+      commit-message:
+          prefix: "[Dependabot] "
+      milestone: 10
 
     - package-ecosystem: "composer"
       directory: "/"
       schedule:
           interval: "daily"
       allow:
           - dependency-type: "development"
+      ignore:
+        - dependency-name: "phpstan/*"
+        - dependency-name: "phpunit/phpunit"
+          versions: [ ">= 9.0.0" ]
+        - dependency-name: "rector/rector"
+        - dependency-name: "thecodingmachine/safe"
+        - dependency-name: "thecodingmachine/phpstan-safe-rule"
       versioning-strategy: "increase"
+      commit-message:
+          prefix: "[Dependabot] "
+      milestone: 10

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
         runs-on: ubuntu-22.04
         strategy:
             matrix:
-                php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+                php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -59,11 +59,11 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+                php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -103,15 +103,16 @@ jobs:
             fail-fast: false
             matrix:
                 command:
-                    - fixer
-                    - stan
-                    - rector
+                    - composer:normalize
+                    - php:fixer
+                    - php:stan
+                    - php:rector
                 php-version:
                     - '8.3'
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -138,8 +139,10 @@ jobs:
                   composer show;
 
             - name: Install development tools
+              env:
+                  GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
-                  phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
+                  phive --no-progress install --trust-gpg-keys 0FDE18AE1D09E19F60F6B1CBC00543248C87FB13,BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
 
             - name: Run Command
-              run: composer ci:php:${{ matrix.command }}
+              run: composer ci:${{ matrix.command }}

.github/workflows/codecoverage.yml

@@ -15,12 +15,14 @@ jobs:
         runs-on: ubuntu-22.04
 
         strategy:
+            fail-fast: false
             matrix:
-                php-version: [ '7.4' ]
+                php-version:
+                    - '7.4'
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -30,6 +32,9 @@ jobs:
                   tools: composer:v2
                   coverage: xdebug
 
+            - name: Show the Composer version
+              run: composer --version
+
             - name: Show the Composer configuration
               run: composer config --global --list
 
@@ -47,11 +52,13 @@ jobs:
                   composer show;
 
             - name: Run Tests
-              run: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
+              run: composer ci:tests:coverage
+
+            - name: Show generated coverage files
+              run: ls -lah
 
-            - name: Upload coverage results to Codacy
+            - name: Upload coverage results to Coveralls
+              uses: coverallsapp/github-action@v2
               env:
-                  CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
-              if: "${{ env.CODACY_PROJECT_TOKEN != '' }}"
-              run: |
-                  ./vendor/bin/codacycoverage clover build/coverage/xml
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  file: coverage.xml

.gitignore

@@ -3,6 +3,7 @@
 /.php_cs.cache
 /.phpunit.result.cache
 /composer.lock
+/coverage.xml
 /phpstan.neon
 /vendor/
 !/.phive/phars.xml

.phive/phars.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.59.3" installed="3.59.3" location="./.phive/php-cs-fixer" copy="false"/>
+  <phar name="composer-normalize" version="^2.44.0" installed="2.48.2" location="./.phive/composer-normalize" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.59.3" installed="3.87.2" location="./.phive/php-cs-fixer" copy="false"/>
 </phive>