Add Support for PHP 8.5, Drop Support for PHP 8.1

.laminas-ci.json

@@ -1,5 +1,5 @@
 {
     "ignore_php_platform_requirements": {
-        "8.4": true
+        "8.5": true
     }
 }

benchmark/ArrayUtilsBench.php

@@ -1,40 +1,34 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-stdlib for the canonical source repository
- * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace LaminasBench\Stdlib;
 
 use Laminas\Stdlib\ArrayUtils;
-use PhpBench\Benchmark\Metadata\Annotations\Iterations;
-use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use PhpBench\Benchmark\Metadata\Annotations\Warmup;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
+use PhpBench\Attributes\Warmup;
 
-/**
- * @Revs(1000)
- * @Iterations(10)
- * @Warmup(2)
- */
-class ArrayUtilsBench
+#[Revs(1000)]
+#[Iterations(10)]
+#[Warmup(2)]
+final class ArrayUtilsBench
 {
-    public function benchHasStringKeys()
+    public function benchHasStringKeys(): void
     {
         ArrayUtils::hasStringKeys([
             'key' => 'value',
         ]);
     }
 
-    public function benchHasIntegerKeys()
+    public function benchHasIntegerKeys(): void
     {
         ArrayUtils::hasIntegerKeys([
             1 => 'value',
         ]);
     }
 
-    public function benchHasNumericKeys()
+    public function benchHasNumericKeys(): void
     {
         ArrayUtils::hasNumericKeys([
             '1' => 'value',

benchmark/ExtractPriorityQueueBench.php

@@ -1,29 +1,27 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-stdlib for the canonical source repository
- * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace LaminasBench\Stdlib;
 
 use Laminas\Stdlib\FastPriorityQueue;
 use Laminas\Stdlib\PriorityQueue;
 use Laminas\Stdlib\SplPriorityQueue;
-use PhpBench\Benchmark\Metadata\Annotations\Iterations;
-use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use PhpBench\Benchmark\Metadata\Annotations\Warmup;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
+use PhpBench\Attributes\Warmup;
 
 use function rand;
 
-/**
- * @Revs(1000)
- * @Iterations(10)
- * @Warmup(2)
- */
-class ExtractPriorityQueueBench
+#[Revs(1000)]
+#[Iterations(10)]
+#[Warmup(2)]
+final class ExtractPriorityQueueBench
 {
+    private SplPriorityQueue $splPriorityQueue;
+    private FastPriorityQueue $fastPriorityQueue;
+    private PriorityQueue $priorityQueue;
+
     public function __construct()
     {
         $this->splPriorityQueue  = new SplPriorityQueue();
@@ -38,17 +36,17 @@ public function __construct()
         }
     }
 
-    public function benchExtractSplPriorityQueue()
+    public function benchExtractSplPriorityQueue(): void
     {
         $this->splPriorityQueue->extract();
     }
 
-    public function benchExtractPriorityQueue()
+    public function benchExtractPriorityQueue(): void
     {
         $this->priorityQueue->extract();
     }
 
-    public function benchExtractFastPriorityQueue()
+    public function benchExtractFastPriorityQueue(): void
     {
         $this->fastPriorityQueue->extract();
     }

benchmark/InsertPriorityQueueBench.php

@@ -1,47 +1,45 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-stdlib for the canonical source repository
- * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace LaminasBench\Stdlib;
 
 use Laminas\Stdlib\FastPriorityQueue;
 use Laminas\Stdlib\PriorityQueue;
 use Laminas\Stdlib\SplPriorityQueue;
-use PhpBench\Benchmark\Metadata\Annotations\Iterations;
-use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use PhpBench\Benchmark\Metadata\Annotations\Warmup;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
+use PhpBench\Attributes\Warmup;
 
 use function rand;
 
-/**
- * @Revs(1000)
- * @Iterations(10)
- * @Warmup(2)
- */
-class InsertPriorityQueueBench
+#[Revs(1000)]
+#[Iterations(10)]
+#[Warmup(2)]
+final class InsertPriorityQueueBench
 {
+    private SplPriorityQueue $splPriorityQueue;
+    private FastPriorityQueue $fastPriorityQueue;
+    private PriorityQueue $priorityQueue;
+
     public function __construct()
     {
         $this->splPriorityQueue  = new SplPriorityQueue();
         $this->fastPriorityQueue = new FastPriorityQueue();
         $this->priorityQueue     = new PriorityQueue();
     }
 
-    public function benchInsertSplPriorityQueue()
+    public function benchInsertSplPriorityQueue(): void
     {
         $this->splPriorityQueue->insert('foo', rand(1, 100));
     }
 
-    public function benchInsertPriorityQueue()
+    public function benchInsertPriorityQueue(): void
     {
         $this->priorityQueue->insert('foo', rand(1, 100));
     }
 
-    public function benchInsertFastPriorityQueue()
+    public function benchInsertFastPriorityQueue(): void
     {
         $this->fastPriorityQueue->insert('foo', rand(1, 100));
     }

benchmark/RemovePriorityQueueBench.php

@@ -1,28 +1,25 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-stdlib for the canonical source repository
- * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace LaminasBench\Stdlib;
 
 use Laminas\Stdlib\FastPriorityQueue;
 use Laminas\Stdlib\PriorityQueue;
-use PhpBench\Benchmark\Metadata\Annotations\Iterations;
-use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use PhpBench\Benchmark\Metadata\Annotations\Warmup;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
+use PhpBench\Attributes\Warmup;
 
 use function rand;
 
-/**
- * @Revs(1000)
- * @Iterations(10)
- * @Warmup(2)
- */
-class RemovePriorityQueueBench
+#[Revs(1000)]
+#[Iterations(10)]
+#[Warmup(2)]
+final class RemovePriorityQueueBench
 {
+    private FastPriorityQueue $fastPriorityQueue;
+    private PriorityQueue $priorityQueue;
+
     public function __construct()
     {
         $this->fastPriorityQueue = new FastPriorityQueue();
@@ -35,12 +32,12 @@ public function __construct()
         }
     }
 
-    public function benchRemovePriorityQueue()
+    public function benchRemovePriorityQueue(): void
     {
         $this->priorityQueue->remove('foo');
     }
 
-    public function benchRemoveFastPriorityQueue()
+    public function benchRemoveFastPriorityQueue(): void
     {
         $this->fastPriorityQueue->remove('foo');
     }

composer.json

@@ -18,7 +18,7 @@
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "8.1.99"
+            "php": "8.2.99"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
@@ -27,14 +27,14 @@
     "extra": {
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "^3.0.1",
-        "phpbench/phpbench": "^1.4.0",
-        "phpunit/phpunit": "^10.5.45",
-        "psalm/plugin-phpunit": "^0.19.2",
-        "vimeo/psalm": "^6.5.1"
+        "laminas/laminas-coding-standard": "^3.1.0",
+        "phpbench/phpbench": "^1.4.1",
+        "phpunit/phpunit": "^11.5.42",
+        "psalm/plugin-phpunit": "^0.19.5",
+        "vimeo/psalm": "^6.13.1"
     },
     "autoload": {
         "psr-4": {