Merge branch 'upstream_master' into mergable_master

Author: raxbg

.editorconfig

@@ -1,7 +1,7 @@
 # top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file, and with same defaults
+# Unix-style newlines with a newline ending every file, and with sane defaults
 [*]
 charset = utf-8
 end_of_line = lf

.gitattributes

@@ -3,9 +3,7 @@
 /.github/ export-ignore
 /.gitignore export-ignore
 /.phive/ export-ignore
-/Doxyfile export-ignore
-/phpcs.xml export-ignore
-/phpstan-baseline.neon export-ignore
-/phpstan.neon.dist export-ignore
+/bin/ export-ignore
+/config/ export-ignore
 /phpunit.xml export-ignore
-/tests export-ignore
+/tests/ export-ignore

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+        interval: "daily"
+    allow:
+        - dependency-type: "development"
+    versioning-strategy: "increase"

.github/workflows/ci.yml

@@ -11,14 +11,14 @@ name: CI
 jobs:
   php-lint:
     name: PHP Lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0' ]
+        php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -27,12 +27,12 @@ jobs:
           coverage: none
 
       - name: PHP Lint
-        run: find lib tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l
+        run: find src tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l
 
   unit-tests:
     name: Unit tests
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     needs: [ php-lint ]
 
@@ -42,12 +42,12 @@ jobs:
         php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3' ]
         coverage: [ 'none' ]
         include:
-          - php-version: 7.4
+          - php-version: '7.4'
             coverage: xdebug
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -57,7 +57,7 @@ jobs:
           coverage: "${{ matrix.coverage }}"
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.cache/composer
           key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -79,26 +79,37 @@ jobs:
         run: |
           ./vendor/bin/codacycoverage clover build/coverage/xml
 
-  phpstan:
-    name: PHPStan
+  static-analysis:
+    name: Static Analysis
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     needs: [ php-lint ]
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - command: sniffer
+            php-version: '7.4'
+          - command: fixer
+            php-version: '7.4'
+          - command: stan
+            php-version: '7.4'
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: ${{ matrix.php-version }}
           tools: "composer:v2, phive"
           coverage: none
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.cache/composer
           key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -112,7 +123,7 @@ jobs:
 
       - name: Install development tools
         run: |
-          echo y | phive --no-progress update phpstan;
+          phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E,A972B9ABB95D0B760B51442231C7E470E2138192,D32680D5957DC7116BE29C14CF1A108D0E7AE720
 
-      - name: Run PHPStan
-        run: "composer ci:php:stan"
+      - name: Run Command
+        run: composer ci:php:${{ matrix.command }}

.gitignore

@@ -1,4 +1,5 @@
 /.phive/*
+/.php-cs-fixer.cache
 /.php_cs.cache
 /composer.lock
 /phpstan.neon

.phive/phars.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpcbf" version="^3.6.0" location="./.phive/phpcbf.phar" copy="false" installed="3.6.0"/>
-  <phar name="phpcs" version="^3.6.0" location="./.phive/phpcs.phar" copy="false" installed="3.6.0"/>
-  <phar name="phpstan" version="^0.12.88" installed="0.12.88" location="./.phive/phpstan.phar" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.9.4" installed="3.9.4" location="./.phive/php-cs-fixer.phar" copy="false"/>
+  <phar name="phpcbf" version="^3.7.1" installed="3.7.1" location="./.phive/phpcbf.phar" copy="false"/>
+  <phar name="phpcs" version="^3.7.1" installed="3.7.1" location="./.phive/phpcs.phar" copy="false"/>
+  <phar name="phpstan" version="^1.8.1" installed="1.8.1" location="./.phive/phpstan.phar" copy="false"/>
 </phive>