Merge pull request #20 from ghostwriter/feature/php-8.2-support

Feature: Support PHP 8.2
laminas · Nov 15, 2022 · 3494a76 · 3494a76
2 parents 0fae039 + ebfcc4f
commit 3494a76
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /laminas-mkdoc-theme/
 /phpunit.xml
 /vendor/
+.phpcs-cache
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,5 +1,8 @@
 {
     "extensions": [
         "gd"
-    ]
-}
+    ],
+    "ignore_php_platform_requirements": {
+        "8.2": true
+    }
+}
diff --git a/composer.json b/composer.json
@@ -16,18 +16,24 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "8.0.99"
+        },
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "laminas/laminas-servicemanager": "^3.10.0",
         "laminas/laminas-stdlib": "^3.6.0",
         "laminas/laminas-validator": "^2.15.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
         "laminas/laminas-config": "^3.7.0",
-        "phpunit/phpunit": "^9.3.7"
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>
         <testsuite name="laminas-barcode Test Suite">
-            <directory>./test</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 
     <php>
         <!-- Enable this if you have installed ZendPdf on the include_path or

diff --git a/src/ObjectPluginManager.php b/src/ObjectPluginManager.php
@@ -8,9 +8,7 @@
 use Laminas\ServiceManager\Exception\InvalidServiceException;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 
-use function get_class;
-use function gettype;
-use function is_object;
+use function get_debug_type;
 use function sprintf;
 
 /**
@@ -147,7 +145,7 @@ public function validate($plugin)
                 '%s can only create instances of %s; %s is invalid',
                 static::class,
                 $this->instanceOf,
-                is_object($plugin) ? get_class($plugin) : gettype($plugin)
+                get_debug_type($plugin)
             ));
         }
     }
@@ -167,7 +165,7 @@ public function validatePlugin($plugin)
         } catch (InvalidServiceException $e) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Plugin of type %s is invalid; must extend %s',
-                is_object($plugin) ? get_class($plugin) : gettype($plugin),
+                get_debug_type($plugin),
                 Object\AbstractObject::class
             ), $e->getCode(), $e);
         }

diff --git a/src/RendererPluginManager.php b/src/RendererPluginManager.php
@@ -8,9 +8,7 @@
 use Laminas\ServiceManager\Exception\InvalidServiceException;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 
-use function get_class;
-use function gettype;
-use function is_object;
+use function get_debug_type;
 use function sprintf;
 
 /**
@@ -79,7 +77,7 @@ public function validate($plugin)
                     '%s can only create instances of %s; %s is invalid',
                     static::class,
                     $this->instanceOf,
-                    is_object($plugin) ? get_class($plugin) : gettype($plugin)
+                    get_debug_type($plugin)
                 )
             );
         }
@@ -101,7 +99,7 @@ public function validatePlugin($plugin)
             throw new Exception\InvalidArgumentException(
                 sprintf(
                     'Plugin of type %s is invalid; must extend %s',
-                    is_object($plugin) ? get_class($plugin) : gettype($plugin),
+                    get_debug_type($plugin),
                     Renderer\AbstractRenderer::class
                 ),
                 $e->getCode(),

diff --git a/test/AssertIsGdImageTrait.php b/test/AssertIsGdImageTrait.php
@@ -7,10 +7,8 @@
 use GdImage;
 use PHPUnit\Framework\Assert;
 
-use function get_class;
+use function get_debug_type;
 use function get_resource_type;
-use function gettype;
-use function is_object;
 use function is_resource;
 use function sprintf;
 
@@ -25,7 +23,7 @@ public static function assertIsGdImage($value, string $message = ''): void
     {
         $message = $message ?: sprintf(
             'Failed asserting that %s is a GD image',
-            is_object($value) ? get_class($value) : gettype($value)
+            get_debug_type($value)
         );
 
         if (PHP_MAJOR_VERSION === 8) {