Merge pull request #114 from diablomedia/php-81

testing php 8.1

.github/workflows/build.yml

@@ -13,21 +13,14 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.2', '7.3', '7.4']
+                php-versions: ['7.4', '8.0', '8.1']
                 composer-args: ['', '--prefer-lowest']
-                include:
-                    - operating-system: ubuntu-latest
-                      php-versions: '8.0'
-                      composer-args: '--ignore-platform-reqs --no-scripts'
-                    - operating-system: ubuntu-latest
-                      php-versions: '8.0'
-                      composer-args: '--prefer-lowest --ignore-platform-reqs --no-scripts'
         runs-on: ${{ matrix.operating-system }}
         steps:
             - name: Checkout
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v2.4.0
             - name: Setup PHP
-              uses: shivammathur/setup-php@2.10.0
+              uses: shivammathur/setup-php@2.16.0
               with:
                   php-version: ${{ matrix.php-versions }}
                   extensions: mbstring
@@ -39,7 +32,7 @@ jobs:
               id: composer-cache
               run: echo "::set-output name=dir::$(composer config cache-files-dir)"
             - name: Cache dependencies
-              uses: actions/cache@v2.1.4
+              uses: actions/cache@v2.1.7
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: php${{ matrix.php-versions }}-composer-${{ matrix.composer-args }}-${{ hashFiles('**/composer.json') }}
@@ -50,21 +43,14 @@ jobs:
             - name: PHPStan
               run: composer phpstan
             - name: Code Style Check
+              env:
+                  PHP_CS_FIXER_IGNORE_ENV: true
               run: composer style-check -- --format=checkstyle | cs2pr
             - name: Test
               run: composer test-with-coverage
             - name: Upload Coverage
-              run: bash <(curl -s https://codecov.io/bash) -f ./clover.xml
-    merge-me:
-        name: Merge me!
-        needs:
-            - build
-        runs-on: ubuntu-latest
-        steps:
-            - name: Merge me!
-              uses: ridedott/merge-me-action@master
+              uses: codecov/codecov-action@v2
               with:
-                  # This must be used as GitHub Actions token does not support
-                  # pushing to protected branches.
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  GITHUB_LOGIN: 'dependabot[bot]'
+                files: ./clover.xml
+                fail_ci_if_error: true
+                verbose: true

.github/workflows/merge-me.yml

@@ -0,0 +1,32 @@
+name: Merge me!
+
+on:
+  workflow_run:
+    types:
+      - completed
+    workflows:
+      - 'Build'
+
+jobs:
+  merge-me:
+    name: Merge me!
+    runs-on: ubuntu-latest
+    steps:
+      - # It is often a desired behavior to merge only when a workflow execution
+        # succeeds. This can be changed as needed.
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        name: Merge me!
+        uses: ridedott/merge-me-action@v2
+        with:
+          # Depending on branch protection rules, a  manually populated
+          # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to
+          # a protected branch must be used. This secret can have an arbitrary
+          # name, as an example, this repository uses `DOTTBOTT_TOKEN`.
+          #
+          # When using a custom token, it is recommended to leave the following
+          # comment for other developers to be aware of the reasoning behind it:
+          #
+          # This must be used as GitHub Actions token does not support pushing
+          # to protected branches.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ENABLE_GITHUB_API_PREVIEW: true

.gitignore

@@ -3,3 +3,4 @@
 /clover.xml
 .php_cs.cache
 .phpunit.result.cache
+.php-cs-fixer.cache

.php_cs → .php-cs-fixer.php

@@ -6,17 +6,16 @@
     ->in(__DIR__)
 ;
 
-return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
+$config = new PhpCsFixer\Config();
+return $config->setRiskyAllowed(true)
     ->setRules(array(
         '@PSR2'                     => true,
         '@PHPUnit60Migration:risky' => true,
-        '@PHPUnit84Migration:risky' => true,
-        'binary_operator_spaces'    => array('align_double_arrow' => true, 'align_equals' => true),
+        'binary_operator_spaces'    => array('operators' => array('=' => 'align', '=>' => 'align')),
         'single_quote'              => true,
         'array_syntax'              => array('syntax' => 'long'),
         'concat_space'              => array('spacing' => 'one'),
-        'psr0'                      => false
+        'psr_autoloading'           => array('dir' => 'src'),
     ))
     ->setUsingCache(true)
     ->setFinder($finder);

composer.json

@@ -10,7 +10,7 @@
     "license": "BSD-3-Clause",
     "prefer-stable": true,
     "require": {
-        "php": "^7.0 || ^8.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "diablomedia/zendframework1-layout": "^1.0.3",
         "diablomedia/zendframework1-mail": "^1.0.0",
         "diablomedia/zendframework1-log": "^1.0.0"
@@ -26,12 +26,12 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5.14 || ^9.0.0",
-        "phpstan/phpstan": "0.12.82",
+        "phpunit/phpunit": "^9.5.10",
+        "phpstan/phpstan": "1.2.0",
         "diablomedia/zendframework1-view-helper-layout": "^1.0",
-        "friendsofphp/php-cs-fixer": "2.18.4",
-        "maglnet/composer-require-checker": "^1.1.0 || ^2.0.0 || ^3.0.0",
-        "phpro/grumphp-shim": "^0.22.0 || ^1.1"
+        "friendsofphp/php-cs-fixer": "3.3.2",
+        "maglnet/composer-require-checker": "^3.0.0",
+        "phpro/grumphp-shim": "^1.5.0"
     },
     "archive": {
         "exclude": [

grumphp.yml.dist

@@ -6,7 +6,7 @@ grumphp:
         composer_require_checker: ~
         phpcsfixer2:
             allow_risky: true
-            config: .php_cs
+            config: .php-cs-fixer.php
         phpstan:
             configuration: phpstan.neon
         phpunit:

phpstan.neon

@@ -3,12 +3,12 @@ parameters:
     level: 8
     paths:
         - ./
-    excludes_analyse:
+    excludePaths:
         - %rootDir%/../../../tests/*
         - %rootDir%/../../../vendor/*
     ignoreErrors:
         # Zend_Layout uses __get and __set
         - '#Access to an undefined property Zend_Layout::\$events\.#'
         -
-            message: '#Parameter \#1 \$(function|callback) of function call_user_func_array expects callable\(\): mixed, array\(Zend_Mail, mixed\) given\.#'
+            message: '#Parameter \#1 \$(function|callback) of function call_user_func_array expects callable\(\): mixed, array{Zend_Mail, mixed} given\.#'
             path: %currentWorkingDirectory%/src/Zend/Log/Writer/Mail.php

phpunit.xml.dist

@@ -1,19 +1,13 @@
-<phpunit
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    beStrictAboutTestsThatDoNotTestAnything="true"
-    backupGlobals="true"
-    stderr="true"
-    colors="true">
-    <testsuites>
-        <testsuite name="default">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" beStrictAboutTestsThatDoNotTestAnything="true" backupGlobals="true" stderr="true" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="default">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Zend/Log/Writer/Mail.php

@@ -139,6 +139,7 @@ public static function factory($config)
             $writer->setLayout($config);
         }
         if (isset($config['layoutFormatter'])) {
+            /** @var Zend_Log_Formatter_Interface $layoutFormatter */
             $layoutFormatter = new $config['layoutFormatter'];
             $writer->setLayoutFormatter($layoutFormatter);
         }

tests/Zend/Log/Writer/MailTest.php

@@ -231,7 +231,7 @@ public function testDestructorMailError()
         // Log an error message so that there's something to send via email.
         $log->err('a bogus error message to force mail sending');
 
-        $this->expectException('PHPUnit\Framework\Error\Error');
+        $this->expectError('PHPUnit\Framework\Error\Error');
         unset($log);
     }
 
@@ -255,7 +255,7 @@ public function testDestructorLayoutError()
         // Log an error message so that there's something to send via email.
         $log->err('a bogus error message to force mail sending');
 
-        $this->expectException('PHPUnit\Framework\Error\Error');
+        $this->expectError('PHPUnit\Framework\Error\Error');
         unset($log);
     }