Merge pull request #45 from gsteel/PHP-8.2

Add PHP 8.2 Support, Drop PHP 7.4 Support

.laminas-ci.json

@@ -1,5 +1,5 @@
 {
-  "ignore_php_platform_requirements": {
-    "8.1": true
-  }
+    "ignore_php_platform_requirements": {
+        "8.2": true
+    }
 }

composer.json

@@ -18,7 +18,7 @@
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "7.4.99"
+            "php": "8.0.99"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
@@ -31,17 +31,17 @@
         }
     },
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "laminas/laminas-http": "^2.15",
         "laminas/laminas-servicemanager": "^3.14.0",
         "laminas/laminas-stdlib": "^3.10.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.4.0",
-        "laminas/laminas-i18n": "^2.15.0",
-        "phpunit/phpunit": "^9.5.5",
+        "laminas/laminas-i18n": "^2.17",
+        "phpunit/phpunit": "^9.5.25",
         "psalm/plugin-phpunit": "^0.17.0",
-        "vimeo/psalm": "^4.24.0"
+        "vimeo/psalm": "^4.28"
     },
     "suggest": {
         "laminas/laminas-i18n": "^2.15.0 if defining translatable HTTP path segments"

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.24.0@06dd975cb55d36af80f242561738f16c5f58264f">
+<files psalm-version="4.28.0@52e96bea381e6cb07a672aefec791a5817694a26">
   <file src="src/Http/Chain.php">
     <InvalidReturnStatement occurrences="1"/>
     <InvalidReturnType occurrences="1">
@@ -1111,6 +1111,9 @@
       <code>testSetRoutesWithInvalidArgument</code>
       <code>testremoveRouteAsArray</code>
     </MissingReturnType>
+    <NoInterfaceProperties occurrences="1">
+      <code>$route-&gt;priority</code>
+    </NoInterfaceProperties>
     <PossiblyNullReference occurrences="4">
       <code>getParam</code>
       <code>getParam</code>

src/Http/Hostname.php

@@ -59,6 +59,14 @@ class Hostname implements RouteInterface
      */
     protected $assembledParams = [];
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     /**
      * Create a new hostname route.
      *

src/Http/Method.php

@@ -36,6 +36,14 @@ class Method implements RouteInterface
      */
     protected $defaults;
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     /**
      * Create a new method route.
      *

src/Http/Part.php

@@ -45,16 +45,6 @@ class Part extends TreeRouteStack implements RouteInterface
      */
     protected $childRoutes;
 
-    /**
-     * Priority.
-     *
-     * @internal For internal classes only. Not designed for general use.
-     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
-     *
-     * @var int|null
-     */
-    public $priority;
-
     /**
      * Create a new part route.
      *

src/Http/Placeholder.php

@@ -19,6 +19,14 @@ class Placeholder implements RouteInterface
 {
     private array $defaults;
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     public function __construct(array $defaults)
     {
         $this->defaults = $defaults;

src/Http/Regex.php

@@ -58,6 +58,14 @@ class Regex implements RouteInterface
      */
     protected $assembledParams = [];
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     /**
      * Create a new regex route.
      *

src/Http/Scheme.php

@@ -32,6 +32,14 @@ class Scheme implements RouteInterface
      */
     protected $defaults;
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     /**
      * Create a new scheme route.
      *

src/Http/Segment.php

@@ -109,6 +109,14 @@ class Segment implements RouteInterface
      */
     protected $translationKeys = [];
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     /**
      * Create a new regex route.
      *

src/Http/TreeRouteStack.php

@@ -52,6 +52,14 @@ class TreeRouteStack extends SimpleRouteStack
      */
     protected $prototypes;
 
+    /**
+     * @internal
+     * @deprecated Since 3.9.0 This property will be removed or made private in version 4.0
+     *
+     * @var int|null
+     */
+    public $priority;
+
     /**
      * factory(): defined by RouteInterface interface.
      *

src/RoutePluginManager.php

@@ -11,7 +11,6 @@
 use Psr\Container\ContainerInterface;
 
 use function array_merge;
-use function get_class;
 use function gettype;
 use function is_object;
 use function sprintf;
@@ -83,7 +82,7 @@ public function validate($instance)
         if (! $instance instanceof $this->instanceOf) {
             throw new InvalidServiceException(sprintf(
                 'Plugin of type %s is invalid; must implement %s',
-                is_object($instance) ? get_class($instance) : gettype($instance),
+                is_object($instance) ? $instance::class : gettype($instance),
                 RouteInterface::class
             ));
         }

test/Http/PartTest.php

@@ -486,6 +486,9 @@ public function testPartRouteMarkedAsMayTerminateButWithQueryRouteChildWillMatch
         $request->setQuery($query);
         $query = $request->getQuery();
 
+        /** @link https://github.com/laminas/laminas-router/commit/66ebd439067d9e25a6f7941de4b9ebc9c52524f5 */
+        $this->markTestSkipped('This test fails and has been skipped because the Query route has been deprecated (?)');
+
         /*
         $match = $route->match($request);
         $this->assertInstanceOf(\Laminas\Router\RouteMatch::class, $match);

test/SimpleRouteStackTest.php

@@ -7,6 +7,14 @@
 use ArrayIterator;
 use Laminas\Router\Exception\InvalidArgumentException;
 use Laminas\Router\Exception\RuntimeException;
+use Laminas\Router\Http\Chain;
+use Laminas\Router\Http\Hostname;
+use Laminas\Router\Http\Literal;
+use Laminas\Router\Http\Method;
+use Laminas\Router\Http\Placeholder;
+use Laminas\Router\Http\Regex;
+use Laminas\Router\Http\Scheme;
+use Laminas\Router\Http\Segment;
 use Laminas\Router\RouteMatch;
 use Laminas\Router\RoutePluginManager;
 use Laminas\Router\SimpleRouteStack;
@@ -280,4 +288,111 @@ public function testHasRoute()
         $stack->addRoute('foo', new TestAsset\DummyRoute());
         $this->assertEquals(true, $stack->hasRoute('foo'));
     }
+
+    /** @return array<class-string, array{0: array, 1: int}> */
+    public function routeTypeProvider(): array
+    {
+        $routePlugins = new RoutePluginManager(new ServiceManager());
+        return [
+            Chain::class       => [
+                [
+                    'type'     => Chain::class,
+                    'priority' => 1,
+                    'options'  => [
+                        'routes'        => [],
+                        'route_plugins' => $routePlugins,
+                    ],
+                ],
+                1,
+            ],
+            Hostname::class    => [
+                [
+                    'type'     => Hostname::class,
+                    'options'  => [
+                        'route'    => 'www.example.com',
+                        'defaults' => [
+                            'controller' => 'SomeController',
+                            'action'     => 'index',
+                        ],
+                    ],
+                    'priority' => 5,
+                ],
+                5,
+            ],
+            Literal::class     => [
+                [
+                    'type'     => Literal::class,
+                    'options'  => [
+                        'route'    => '/blah',
+                        'defaults' => [
+                            'controller' => 'SomeController',
+                            'action'     => 'index',
+                        ],
+                    ],
+                    'priority' => 10,
+                ],
+                10,
+            ],
+            Method::class      => [
+                [
+                    'type'     => Method::class,
+                    'options'  => [
+                        'route' => '/duck',
+                        'verb'  => 'QUACK',
+                    ],
+                    'priority' => 20,
+                ],
+                20,
+            ],
+            Placeholder::class => [
+                [
+                    'type'     => Placeholder::class,
+                    'options'  => [],
+                    'priority' => 30,
+                ],
+                30,
+            ],
+            Regex::class       => [
+                [
+                    'type'     => Regex::class,
+                    'options'  => [
+                        'regex' => '/(?<foo>[^/]+)',
+                        'spec'  => '/%foo%',
+                    ],
+                    'priority' => 40,
+                ],
+                40,
+            ],
+            Scheme::class      => [
+                [
+                    'type'     => Scheme::class,
+                    'options'  => [
+                        'scheme' => 'carrots',
+                    ],
+                    'priority' => 50,
+                ],
+                50,
+            ],
+            Segment::class     => [
+                [
+                    'type'     => Segment::class,
+                    'options'  => [
+                        'route' => '/mushrooms',
+                    ],
+                    'priority' => 60,
+                ],
+                60,
+            ],
+        ];
+    }
+
+    /** @dataProvider routeTypeProvider */
+    public function testSimpleRouteStackSetsPriorityForAllKnownRouteTypes(array $routeSpec, int $expectedPriority): void
+    {
+        $router = new SimpleRouteStack();
+        $router->addRoute('name', $routeSpec);
+
+        $route = $router->getRoute('name');
+        self::assertEquals($expectedPriority, $route->priority);
+    }
 }