Preparing for PHP 8.2 (diablomedia#231

* Preparing for PHP 8.2 * final deps
fragotesac · Apr 19, 2023 · d9c3592 · d9c3592
1 parent dac2e64
commit d9c3592
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 69 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,14 +13,14 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4', '8.0', '8.1']
+                php-versions: ['7.4', '8.0', '8.1', '8.2']
                 composer-args: ['', '--prefer-lowest']
         runs-on: ${{ matrix.operating-system }}
         steps:
             - name: Checkout
               uses: actions/checkout@v3
             - name: Setup PHP
-              uses: shivammathur/setup-php@2.19.1
+              uses: shivammathur/setup-php@2.24.0
               with:
                   php-version: ${{ matrix.php-versions }}
                   extensions: mbstring
@@ -30,7 +30,7 @@ jobs:
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
             - name: Get composer cache directory
               id: composer-cache
-              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+              run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
             - name: Cache dependencies
               uses: actions/cache@v3
               with:
@@ -52,5 +52,4 @@ jobs:
               uses: codecov/codecov-action@v3
               with:
                 files: ./clover.xml
-                fail_ci_if_error: true
                 verbose: true
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -0,0 +1,22 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/merge-me.yml b/.github/workflows/merge-me.yml
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
         "diablomedia/zendframework1-exception": "^1.0.0",
         "diablomedia/zendframework1-config": "^1.0.0 || ^2.0.0",
         "diablomedia/zendframework1-loader": "^1.0.0",
@@ -33,8 +33,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.10",
-        "phpstan/phpstan": "1.4.3",
-        "friendsofphp/php-cs-fixer": "3.6.0",
+        "phpstan/phpstan": "1.10.13",
+        "friendsofphp/php-cs-fixer": "3.16.0",
         "maglnet/composer-require-checker": "^3.0.0",
         "phpro/grumphp-shim": "^1.5.0"
     },
@@ -54,5 +54,10 @@
     },
     "suggest": {
         "ext-xml": "Many of the translation adapters require this extension"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpro/grumphp-shim": true
+        }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -13,18 +13,12 @@ parameters:
         - '#PHPDoc tag @param references unknown parameter: \$content#'
         - '#PHPDoc tag @param references unknown parameter: \$locale#'
         - '#PHPDoc tag @param references unknown parameter: \$args#'
-        -
-            message: '#Offset .+ does not exist on array{.+}\.#'
-            path: ./src/Zend/Translate/Adapter.php
         -
             message: '#Offset string on array{} in isset\(\) does not exist\.#'
             path: ./src/Zend/Translate/Adapter/Array.php
         -
             message: '#Offset string on array{} in isset\(\) does not exist\.#'
             path: ./src/Zend/Translate/Adapter/Ini.php
-        -
-            message: '#Offset .+ on array{.+} in empty\(\) does not exist\.#'
-            path: ./src/Zend/Translate/Adapter.php
         # Defensive coding, argument can be multiple types
         -
             message: '#Result of \|\| is always true\.#'
@@ -66,7 +60,3 @@ parameters:
         -
             message: '#Method Zend_Translate_Adapter_XmlTm::_contentElement\(\) is unused\.#'
             path: ./src/Zend/Translate/Adapter/XmlTm.php
-        # This isn't true, there is an empty check on this property in the class
-        -
-            message: '#Property Zend_Translate_Adapter_Tmx::\$_useId is never read, only written\.#'
-            path: ./src/Zend/Translate/Adapter/Tmx.php
diff --git a/tests/Zend/Translate/Adapter/ArrayTest.php b/tests/Zend/Translate/Adapter/ArrayTest.php
@@ -59,7 +59,7 @@ public function testCreate()
         set_error_handler(array($this, 'errorHandlerIgnore'));
         $adapter = new Zend_Translate_Adapter_Array(array());
         restore_error_handler();
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Array);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Array::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Array('hastofail', 'en');
@@ -216,7 +216,7 @@ public function testOptionLocaleFilename()
     public function testLoadArrayFile()
     {
         $adapter = new Zend_Translate_Adapter_Array(dirname(__FILE__) . '/_files/translation_en.php');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Array);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Array::class, $adapter);
     }
 
     public function testDisablingNotices()
@@ -226,13 +226,13 @@ public function testDisablingNotices()
         $this->assertTrue($this->_errorOccurred);
         restore_error_handler();
         $this->_errorOccurred = false;
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Array);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Array::class, $adapter);
 
         set_error_handler(array($this, 'errorHandlerIgnore'));
         $adapter = new Zend_Translate_Adapter_Array(array(), 'en', array('disableNotices' => true));
         $this->assertFalse($this->_errorOccurred);
         restore_error_handler();
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Array);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Array::class, $adapter);
     }
 
     public function testGettingAllMessageIds()
@@ -274,12 +274,12 @@ public function testCaching()
 
         $adapter = new Zend_Translate_Adapter_Array(dirname(__FILE__) . '/_files/translation_en.php', 'en');
         $cache   = Zend_Translate_Adapter_Array::getCache();
-        $this->assertTrue($cache instanceof Zend_Cache_Core);
+        $this->assertInstanceOf(Zend_Cache_Core::class, $cache);
         unset($adapter);
 
         $adapter = new Zend_Translate_Adapter_Array(dirname(__FILE__) . '/_files/translation_en.php', 'en');
         $cache   = Zend_Translate_Adapter_Array::getCache();
-        $this->assertTrue($cache instanceof Zend_Cache_Core);
+        $this->assertInstanceOf(Zend_Cache_Core::class, $cache);
 
         Zend_Translate_Adapter_Array::removeCache();
         $this->assertFalse(Zend_Translate_Adapter_Array::hasCache());
@@ -307,7 +307,7 @@ public function testLoadingFilesIntoCacheAfterwards()
 
         $adapter = new Zend_Translate_Adapter_Array(dirname(__FILE__) . '/_files/translation_en.php', 'en');
         $cache   = Zend_Translate_Adapter_Array::getCache();
-        $this->assertTrue($cache instanceof Zend_Cache_Core);
+        $this->assertInstanceOf(Zend_Cache_Core::class, $cache);
 
         $adapter->addTranslation(dirname(__FILE__) . '/_files/translation_en.php', 'ru', array('reload' => true));
         $test = $adapter->getMessages('all');

diff --git a/tests/Zend/Translate/Adapter/CsvTest.php b/tests/Zend/Translate/Adapter/CsvTest.php
@@ -31,6 +31,8 @@
  */
 class Zend_Translate_Adapter_CsvTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function setUp(): void
     {
         if (Zend_Translate_Adapter_Csv::hasCache()) {
@@ -41,7 +43,7 @@ public function setUp(): void
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Csv(dirname(__FILE__) . '/_files/translation_en.csv');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Csv);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Csv::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Csv(dirname(__FILE__) . '/_files/nofile.csv', 'en');

diff --git a/tests/Zend/Translate/Adapter/GettextTest.php b/tests/Zend/Translate/Adapter/GettextTest.php
@@ -31,6 +31,8 @@
  */
 class Zend_Translate_Adapter_GettextTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     /**
      * Runs the test methods of this class.
      *
@@ -53,7 +55,7 @@ public function setUp(): void
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Gettext(dirname(__FILE__) . '/_files/translation_en.mo');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Gettext);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Gettext::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Gettext(dirname(__FILE__) . '/_files/nofile.mo', 'en');

diff --git a/tests/Zend/Translate/Adapter/IniTest.php b/tests/Zend/Translate/Adapter/IniTest.php
@@ -31,10 +31,12 @@
  */
 class Zend_Translate_Adapter_IniTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Ini(dirname(__FILE__) . '/_files/translation_en.ini');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Ini);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Ini::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Ini(dirname(__FILE__) . '/_files/nofile.ini', 'en');

diff --git a/tests/Zend/Translate/Adapter/QtTest.php b/tests/Zend/Translate/Adapter/QtTest.php
@@ -31,10 +31,12 @@
  */
 class Zend_Translate_Adapter_QtTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Qt(dirname(__FILE__) . '/_files/translation_en.ts');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Qt);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Qt::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Qt(dirname(__FILE__) . '/_files/nofile.ts', 'en');

diff --git a/tests/Zend/Translate/Adapter/TbxTest.php b/tests/Zend/Translate/Adapter/TbxTest.php
@@ -31,10 +31,12 @@
  */
 class Zend_Translate_Adapter_TbxTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Tbx(dirname(__FILE__) . '/_files/translation_en.tbx', 'en');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Tbx);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Tbx::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Tbx(dirname(__FILE__) . '/_files/nofile.tbx', 'en');

diff --git a/tests/Zend/Translate/Adapter/TmxTest.php b/tests/Zend/Translate/Adapter/TmxTest.php
@@ -31,10 +31,12 @@
  */
 class Zend_Translate_Adapter_TmxTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Tmx(dirname(__FILE__) . '/_files/translation_en.tmx', 'en');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Tmx);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Tmx::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Tmx(dirname(__FILE__) . '/_files/nofile.tmx', 'en');

diff --git a/tests/Zend/Translate/Adapter/XliffTest.php b/tests/Zend/Translate/Adapter/XliffTest.php
@@ -31,10 +31,12 @@
  */
 class Zend_Translate_Adapter_XliffTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_Xliff(dirname(__FILE__) . '/_files/translation_en.xliff', 'en');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Xliff);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Xliff::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_Xliff(dirname(__FILE__) . '/_files/nofile.xliff', 'en');

diff --git a/tests/Zend/Translate/Adapter/XmlTmTest.php b/tests/Zend/Translate/Adapter/XmlTmTest.php
@@ -31,10 +31,12 @@
  */
 class Zend_Translate_Adapter_XmlTmTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccurred;
+
     public function testCreate()
     {
         $adapter = new Zend_Translate_Adapter_XmlTm(dirname(__FILE__) . '/_files/translation_en.xmltm');
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_XmlTm);
+        $this->assertInstanceOf(Zend_Translate_Adapter_XmlTm::class, $adapter);
 
         try {
             $adapter = new Zend_Translate_Adapter_XmlTm(dirname(__FILE__) . '/_files/nofile.xmltm', 'en');

diff --git a/tests/Zend/TranslateTest.php b/tests/Zend/TranslateTest.php
@@ -31,6 +31,8 @@
  */
 class Zend_TranslateTest extends PHPUnit\Framework\TestCase
 {
+    protected $_errorOccured;
+
     public function setUp(): void
     {
         if (Zend_Translate::hasCache()) {
@@ -45,7 +47,7 @@ public function setUp(): void
     public function testCreate()
     {
         $lang = new Zend_Translate(Zend_Translate::AN_ARRAY, array('1' => '1'));
-        $this->assertTrue($lang instanceof Zend_Translate);
+        $this->assertInstanceOf(Zend_Translate::class, $lang);
     }
 
     public function testLocaleInitialization()
@@ -224,14 +226,14 @@ public function testTestingCacheHandling()
         Zend_Translate::setCache($cache);
 
         $cache = Zend_Translate::getCache();
-        $this->assertTrue($cache instanceof Zend_Cache_Core);
+        $this->assertInstanceOf(Zend_Cache_Core::class, $cache);
         $this->assertTrue(Zend_Translate::hasCache());
 
         $lang    = new Zend_Translate(Zend_Translate::AN_ARRAY, array('msg1' => 'Message 1 (en)'), 'en');
         $adapter = $lang->getAdapter();
-        $this->assertTrue($adapter instanceof Zend_Translate_Adapter_Array);
+        $this->assertInstanceOf(Zend_Translate_Adapter_Array::class, $adapter);
         $adaptercache = $adapter->getCache();
-        $this->assertTrue($adaptercache instanceof Zend_Cache_Core);
+        $this->assertInstanceOf(Zend_Cache_Core::class, $adaptercache);
 
         Zend_Translate::clearCache();
         $this->assertTrue(Zend_Translate::hasCache());
@@ -846,7 +848,7 @@ public function testSetCacheThroughOptions()
         ));
 
         $return = Zend_Translate::getCache();
-        $this->assertTrue($return instanceof Zend_Cache_Core);
+        $this->assertInstanceOf(Zend_Cache_Core::class, $return);
         $this->assertTrue(Zend_Translate::hasCache());
     }