Merge pull request #31 from weierophinney/feature/php-8.2-support

Drop PHP 7 support, add PHP 8.1 and 8.2 support
laminas-api-tools · Jul 11, 2023 · e0ea083 · e0ea083
2 parents bb7b532 + 048d542
commit e0ea083
Show file tree

Hide file tree

Showing 9 changed files with 896 additions and 917 deletions.
diff --git a/composer.json b/composer.json
@@ -30,28 +30,27 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "laminas-api-tools/api-tools-api-problem": "^1.4.0",
-        "laminas-api-tools/api-tools-content-negotiation": "^1.5.0",
-        "laminas-api-tools/api-tools-hal": "^1.4",
-        "laminas-api-tools/api-tools-mvc-auth": "^1.6",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+        "laminas-api-tools/api-tools-api-problem": "^1.6.0",
+        "laminas-api-tools/api-tools-content-negotiation": "^1.8.0",
+        "laminas-api-tools/api-tools-hal": "^1.7",
+        "laminas-api-tools/api-tools-mvc-auth": "^1.8",
         "laminas/laminas-eventmanager": "^3.2",
         "laminas/laminas-mvc": "^2.7.14 || ^3.0.2",
         "laminas/laminas-paginator": "^2.7",
-        "laminas/laminas-stdlib": "^2.7.8 || ^3.3",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-stdlib": "^2.7.8 || ^3.3"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
         "laminas/laminas-escaper": "^2.5.2",
         "laminas/laminas-http": "^2.5.4",
         "laminas/laminas-inputfilter": "^2.7.2",
-        "laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
+        "laminas/laminas-servicemanager": "^3.11",
         "laminas/laminas-uri": "^2.5.2",
         "laminas/laminas-validator": "^2.8.1",
         "laminas/laminas-view": "^2.11.3",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Factory/OptionsListenerFactory.php b/src/Factory/OptionsListenerFactory.php
@@ -4,10 +4,10 @@
 
 namespace Laminas\ApiTools\Rest\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\Rest\Listener\OptionsListener;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerInterface;
 
 use function array_key_exists;
 use function is_array;

diff --git a/src/Factory/RestControllerFactory.php b/src/Factory/RestControllerFactory.php
@@ -4,7 +4,6 @@
 
 namespace Laminas\ApiTools\Rest\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\Hal\Collection;
 use Laminas\ApiTools\Rest\Resource;
 use Laminas\ApiTools\Rest\RestController;
@@ -15,13 +14,13 @@
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use Laminas\Stdlib\Parameters;
+use Psr\Container\ContainerInterface;
 
 use function array_key_exists;
 use function array_keys;
 use function array_merge;
 use function array_unique;
 use function class_exists;
-use function get_class;
 use function gettype;
 use function in_array;
 use function is_array;
@@ -135,11 +134,11 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
                 '%s expects that the "listener" reference a service that implements '
                 . 'Laminas\EventManager\ListenerAggregateInterface; received %s',
                 __METHOD__,
-                is_object($listener) ? get_class($listener) : gettype($listener)
+                is_object($listener) ? $listener::class : gettype($listener)
             ));
         }
 
-        $resourceIdentifiers = [get_class($listener)];
+        $resourceIdentifiers = [$listener::class];
         if (isset($config['resource_identifiers'])) {
             if (! is_array($config['resource_identifiers'])) {
                 $config['resource_identifiers'] = (array) $config['resource_identifiers'];

diff --git a/src/Resource.php b/src/Resource.php
@@ -24,7 +24,6 @@
 use function array_merge;
 use function array_walk;
 use function func_get_args;
-use function get_class;
 use function gettype;
 use function is_array;
 use function is_bool;
@@ -138,7 +137,7 @@ public function setRouteMatch($matches)
                 __METHOD__,
                 RouteMatch::class,
                 V2RouteMatch::class,
-                is_object($matches) ? get_class($matches) : gettype($matches)
+                is_object($matches) ? $matches::class : gettype($matches)
             ));
         }
         $this->routeMatch = $matches;

diff --git a/src/ResourceEvent.php b/src/ResourceEvent.php
@@ -15,7 +15,6 @@
 use Laminas\Stdlib\Parameters;
 use Laminas\Stdlib\RequestInterface;
 
-use function get_class;
 use function gettype;
 use function is_array;
 use function is_object;
@@ -163,7 +162,7 @@ public function setRouteMatch($matches = null)
                 __METHOD__,
                 RouteMatch::class,
                 V2RouteMatch::class,
-                is_object($matches) ? get_class($matches) : gettype($matches)
+                is_object($matches) ? $matches::class : gettype($matches)
             ));
         }
         $this->routeMatch = $matches;

diff --git a/test/ChildResourcesIntegrationTest.php b/test/ChildResourcesIntegrationTest.php
@@ -4,7 +4,6 @@
 
 namespace LaminasTest\ApiTools\Rest;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\ApiProblem\View\ApiProblemRenderer;
 use Laminas\ApiTools\Hal\Collection;
 use Laminas\ApiTools\Hal\Collection as HalCollection;
@@ -28,6 +27,7 @@
 use Laminas\View\HelperPluginManager;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 use ReflectionObject;
 use stdClass;
 

diff --git a/test/CollectionIntegrationTest.php b/test/CollectionIntegrationTest.php
@@ -4,7 +4,6 @@
 
 namespace LaminasTest\ApiTools\Rest;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\ApiProblem\View\ApiProblemRenderer;
 use Laminas\ApiTools\ContentNegotiation\AcceptListener;
 use Laminas\ApiTools\Hal\Extractor\LinkCollectionExtractor;
@@ -41,6 +40,7 @@
 use Laminas\View\HelperPluginManager;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 use function json_decode;
 use function method_exists;

diff --git a/test/RestControllerTest.php b/test/RestControllerTest.php
@@ -5,7 +5,6 @@
 namespace LaminasTest\ApiTools\Rest;
 
 use Error;
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\ApiProblem\ApiProblem;
 use Laminas\ApiTools\ApiProblem\ApiProblemResponse;
 use Laminas\ApiTools\ApiProblem\Exception\DomainException;
@@ -45,6 +44,7 @@
 use Laminas\View\Model\ModelInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 use ReflectionMethod;
 use ReflectionObject;
 use stdClass;
@@ -981,7 +981,7 @@ public function testGetListTriggersPreAndPostEvents()
         $this->assertSame(
             $collection,
             $test->collection,
-            'Expected ' . get_class($collection) . ', received ' . get_class($test->collection)
+            'Expected ' . $collection::class . ', received ' . get_class($test->collection)
         );
     }