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

weierophinney · web-flow · commit f175696276b2 · 2023-07-11T13:25:42.000-05:00
Drop PHP 7 support, add PHP 8.2 support
diff --git a/composer.json b/composer.json
@@ -21,6 +21,9 @@
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
+        },
+        "platform": {
+            "php": "8.0.99"
         }
     },
     "extra": {
@@ -29,18 +32,18 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "laminas/laminas-eventmanager": "^3.2",
         "laminas/laminas-http": "^2.5.4",
         "laminas/laminas-modulemanager": "^2.7.2",
         "laminas/laminas-mvc": "^2.7.15 || ^3.0.2",
-        "laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
+        "laminas/laminas-servicemanager": "^3.11",
         "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5.10",
         "psalm/plugin-phpunit": "^0.16.1",
         "vimeo/psalm": "^4.13.1"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/config/module.config.php b/config/module.config.php
@@ -36,12 +36,6 @@
         ],
     ],
     'service_manager'      => [
-        // Legacy Zend Framework aliases
-        'aliases'   => [
-            \ZF\Versioning\AcceptListener::class      => AcceptListener::class,
-            \ZF\Versioning\ContentTypeListener::class => ContentTypeListener::class,
-            \ZF\Versioning\VersionListener::class     => VersionListener::class,
-        ],
         'factories' => [
             AcceptListener::class      => Factory\AcceptListenerFactory::class,
             ContentTypeListener::class => Factory\ContentTypeListenerFactory::class,
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" 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="LaminasVersioning Module Tests">
-      <directory>./test</directory>
-    </testsuite>
-  </testsuites>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    bootstrap="./vendor/autoload.php"
+    colors="true"
+    xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd">
+    <coverage includeUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
+
+    <testsuites>
+        <testsuite name="LaminasVersioning Module Tests">
+            <directory>./test</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -28,7 +28,14 @@
                 <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
             </errorLevel>
         </InternalMethod>
+
+        <InvalidReturnType>
+            <errorLevel type="suppress">
+                <file name="./test/TestAsset/Application.php"/>
+            </errorLevel>
+        </InvalidReturnType>
     </issueHandlers>
+
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
diff --git a/src/ContentTypeListener.php b/src/ContentTypeListener.php
@@ -15,7 +15,6 @@
 use function array_reverse;
 use function array_shift;
 use function explode;
-use function get_class;
 use function gettype;
 use function is_array;
 use function is_int;
@@ -66,7 +65,7 @@ public function addRegexp($regex)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects a string regular expression as an argument; received %s',
                 __METHOD__,
-                is_object($regex) ? get_class($regex) : gettype($regex)
+                is_object($regex) ? $regex::class : gettype($regex)
             ));
         }
         $this->regexes[] = $regex;
diff --git a/src/Factory/AcceptListenerFactory.php b/src/Factory/AcceptListenerFactory.php
@@ -4,8 +4,8 @@
 
 namespace Laminas\ApiTools\Versioning\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\Versioning\AcceptListener;
+use Psr\Container\ContainerInterface;
 
 class AcceptListenerFactory
 {
diff --git a/src/Factory/ContentTypeListenerFactory.php b/src/Factory/ContentTypeListenerFactory.php
@@ -4,8 +4,8 @@
 
 namespace Laminas\ApiTools\Versioning\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\Versioning\ContentTypeListener;
+use Psr\Container\ContainerInterface;
 
 class ContentTypeListenerFactory
 {
diff --git a/src/Module.php b/src/Module.php
@@ -8,8 +8,11 @@
 use Laminas\ApiTools\Versioning\ContentTypeListener;
 use Laminas\ApiTools\Versioning\VersionListener;
 use Laminas\ModuleManager\ModuleManager;
+use Laminas\Mvc\ApplicationInterface;
 use Laminas\Mvc\MvcEvent;
 
+use function assert;
+
 /**
  * Laminas module
  */
@@ -52,7 +55,8 @@ public function init($moduleManager)
      */
     public function onBootstrap($e)
     {
-        $app      = $e->getTarget();
+        $app = $e->getTarget();
+        assert($app instanceof ApplicationInterface);
         $events   = $app->getEventManager();
         $services = $app->getServiceManager();
         $services->get(AcceptListener::class)->attach($events);
diff --git a/test/Factory/AcceptListenerFactoryTest.php b/test/Factory/AcceptListenerFactoryTest.php
@@ -4,11 +4,11 @@
 
 namespace LaminasTest\ApiTools\Versioning\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\Versioning\AcceptListener;
 use Laminas\ApiTools\Versioning\Factory\AcceptListenerFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 use ReflectionClass;
 
 class AcceptListenerFactoryTest extends TestCase
diff --git a/test/Factory/ContentTypeListenerFactoryTest.php b/test/Factory/ContentTypeListenerFactoryTest.php
@@ -4,11 +4,11 @@
 
 namespace LaminasTest\ApiTools\Versioning\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ApiTools\Versioning\ContentTypeListener;
 use Laminas\ApiTools\Versioning\Factory\ContentTypeListenerFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 use ReflectionClass;
 
 class ContentTypeListenerFactoryTest extends TestCase
diff --git a/test/TestAsset/Application.php b/test/TestAsset/Application.php
@@ -5,14 +5,18 @@
 namespace LaminasTest\ApiTools\Versioning\TestAsset;
 
 use Laminas\EventManager\EventManagerInterface;
+use Laminas\Mvc\ApplicationInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\Stdlib\RequestInterface;
+use Laminas\Stdlib\ResponseInterface;
 
-class Application
+/** @psalm-suppress MissingConstructor */
+class Application implements ApplicationInterface
 {
-    /** @var EventManagerInterface|null */
+    /** @var EventManagerInterface */
     protected $events;
 
-    /** @var ServiceLocatorInterface|null */
+    /** @var ServiceLocatorInterface */
     protected $services;
 
     public function setServiceManager(ServiceLocatorInterface $services): void
@@ -25,15 +29,47 @@ public function setEventManager(EventManagerInterface $events): void
         $this->events = $events;
     }
 
-    /** @return ServiceLocatorInterface|null */
+    /** @return ServiceLocatorInterface */
     public function getServiceManager()
     {
         return $this->services;
     }
 
-    /** @return EventManagerInterface|null */
+    /** @return EventManagerInterface */
     public function getEventManager()
     {
         return $this->events;
     }
+
+    // Unimplemented methods
+    // phpcs:disable Squiz.Commenting.FunctionComment.InvalidNoReturn
+
+    /**
+     * Get the request object
+     *
+     * @return RequestInterface
+     */
+    public function getRequest()
+    {
+    }
+
+    /**
+     * Get the response object
+     *
+     * @return ResponseInterface
+     */
+    public function getResponse()
+    {
+    }
+
+    /**
+     * Run the application
+     *
+     * @return self
+     */
+    public function run()
+    {
+    }
+
+    // phpcs:enable Squiz Commenting.FunctionComment.InvalidNoReturn
 }

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Laminas\ApiTools\Versioning\Factory;`
`6`	`6`
`7`		`-use Interop\Container\ContainerInterface;`
`8`	`7`	`use Laminas\ApiTools\Versioning\AcceptListener;`
	`8`	`+use Psr\Container\ContainerInterface;`
`9`	`9`
`10`	`10`	`class AcceptListenerFactory`
`11`	`11`	`{`