Revert 'fix' for template order. Update test cases to reflect expecte…

…d inference

Signed-off-by: George Steel <[email protected]>

src/PriorityQueue.php

@@ -30,8 +30,8 @@
  * "inner" iterator in the form of an SplPriorityQueue object for performing
  * the actual iteration.
  *
- * @template TPriority of int
  * @template TValue
+ * @template TPriority of int
  * @implements IteratorAggregate<array-key, TValue>
  */
 class PriorityQueue implements Countable, IteratorAggregate, Serializable

src/SplPriorityQueue.php

@@ -24,8 +24,8 @@
  * Also, provides predictable heap order for datums added with the same priority
  * (i.e., they will be emitted in the same order they are enqueued).
  *
- * @template TPriority of int
  * @template TValue
+ * @template TPriority of int
  * @extends \SplPriorityQueue<TPriority, TValue>
  */
 class SplPriorityQueue extends \SplPriorityQueue implements Serializable

test/StaticAnalysis/PriorityQueueGenericsCanBeUnderstood.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Stdlib\StaticAnalysis;
+
+use Laminas\Stdlib\PriorityQueue;
+
+use function array_values;
+use function iterator_to_array;
+
+final class PriorityQueueGenericsCanBeUnderstood
+{
+    /** @var PriorityQueue<string, int> */
+    private PriorityQueue $laminas;
+
+    /**
+     * @param PriorityQueue<string, int> $laminas
+     */
+    public function __construct(
+        PriorityQueue $laminas
+    ) {
+        $this->laminas = $laminas;
+    }
+
+    /** @return list<string> */
+    public function laminasList(): array
+    {
+        return array_values(iterator_to_array($this->laminas));
+    }
+}

test/StaticAnalysis/SplPriorityQueueGenericsCanBeUnderstood.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Stdlib\StaticAnalysis;
+
+use Laminas\Stdlib\SplPriorityQueue;
+
+use function array_values;
+use function iterator_to_array;
+
+final class SplPriorityQueueGenericsCanBeUnderstood
+{
+    /** @var SplPriorityQueue<string, int> */
+    private SplPriorityQueue $laminas;
+
+    /**
+     * @param SplPriorityQueue<string, int> $laminas
+     */
+    public function __construct(
+        SplPriorityQueue $laminas
+    ) {
+        $this->laminas = $laminas;
+    }
+
+    /** @return list<string> */
+    public function laminasList(): array
+    {
+        return array_values(iterator_to_array($this->laminas));
+    }
+}