Merge pull request #8 from dereuromark/master

PHPStan level 6 green

Author: floriankraemer

.github/workflows/ci.yml

@@ -1,73 +1,73 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  testsuite:
-    name: Unittests
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version: ['7.4', '8.2']
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.4'
-        extensions: mbstring, json, fileinfo
-        tools: pecl
-        coverage: pcov
-
-    - name: Composer install
-      run: |
-        if [[ ${{ matrix.prefer-lowest == 'prefer-lowest' }} ]]; then
-          composer update --prefer-lowest --prefer-stable
-        else
-          composer install
-        fi
-
-    - name: Phive install
-      run: php config/composer_phive.php
-
-    - name: Run PHPUnit
-      run: |
-        if [[ ${{ matrix.php-version }} == '7.4' ]]; then
-          bin/phpunit --coverage-clover=coverage.xml
-        else
-          bin/phpunit
-        fi
-
-    - name: Code Coverage Report
-      if: success() && matrix.php-version == '7.4'
-      uses: codecov/codecov-action@v1
-
-  cs-stan:
-    name: Coding Standard & Static Analysis
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.4'
-        extensions: mbstring, json, fileinfo
-        coverage: none
-        tools: pecl
-
-    - name: Composer install
-      run: composer update --prefer-lowest --prefer-stable
-
-    - name: Phive install
-      run: php config/composer_phive.php
-
-    - name: Run phpstan
-      run: bin/phpstan -V && bin/phpstan analyse src -l 5 --error-format=github
-
-    - name: Run phpcs
-      run: bin/phpcs --version && bin/phpcs --report=checkstyle --standard=phpcs.xml src/ tests/
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  testsuite:
+    name: Unittests
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['7.4', '8.2']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+        extensions: mbstring, json, fileinfo
+        tools: pecl
+        coverage: pcov
+
+    - name: Composer install
+      run: |
+        if [[ ${{ matrix.prefer-lowest == 'prefer-lowest' }} ]]; then
+          composer update --prefer-lowest --prefer-stable
+        else
+          composer install
+        fi
+
+    - name: Phive install
+      run: php config/composer_phive.php
+
+    - name: Run PHPUnit
+      run: |
+        if [[ ${{ matrix.php-version }} == '7.4' ]]; then
+          bin/phpunit --coverage-clover=coverage.xml
+        else
+          bin/phpunit
+        fi
+
+    - name: Code Coverage Report
+      if: success() && matrix.php-version == '7.4'
+      uses: codecov/codecov-action@v1
+
+  cs-stan:
+    name: Coding Standard & Static Analysis
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+        extensions: mbstring, json, fileinfo
+        coverage: none
+        tools: pecl
+
+    - name: Composer install
+      run: composer update --prefer-lowest --prefer-stable
+
+    - name: Phive install
+      run: php config/composer_phive.php
+
+    - name: Run phpstan
+      run: bin/phpstan --error-format=github
+
+    - name: Run phpcs
+      run: bin/phpcs --report=checkstyle

.gitignore

@@ -1,9 +1,9 @@
-/.idea
-/.phpunit.result.cache
-/tmp
-/logs
-/vendor/
-/bin
-coverage.xml
-phive*.phar
-/composer.lock
+.idea/
+.phpunit.result.cache
+tmp/
+logs/
+vendor/
+bin/
+coverage.xml
+phive*.phar
+composer.lock

phive.xml renamed to .phive/phars.xml

@@ -27,9 +27,9 @@
         <phar url="https://some.tld/tool.phar" />
         <phar url="someone/somerepo" />
     -->
-  <phar name="phpunit" version="^9.5" installed="9.5.21" location="./bin/phpunit" copy="true"/>
-  <phar name="phpstan" version="^1.8.10" installed="1.8.10" location="./bin/phpstan" copy="true"/>
-  <phar name="phpcs" version="^3.5.3" installed="3.5.3" location="./bin/phpcs" copy="true"/>
-  <phar name="phpcbf" version="^3.5.3" installed="3.5.4" location="./bin/phpcbf" copy="true"/>
+  <phar name="phpunit" version="^9.5" installed="9.5.26" location="./bin/phpunit" copy="true"/>
+  <phar name="phpstan" version="^1.8.10" installed="1.9.2" location="./bin/phpstan" copy="true"/>
+  <phar name="phpcs" version="^3.5.3" installed="3.7.1" location="./bin/phpcs" copy="true"/>
+  <phar name="phpcbf" version="^3.5.3" installed="3.7.1" location="./bin/phpcbf" copy="true"/>
   <phar name="grumphp" version="^0.19.1" installed="0.19.1" location="./bin/grumphp" copy="true"/>
 </phive>