Merge pull request #112 from laminas/renovate/lock-file-maintenance

Lock file maintenance
laminas · Jan 3, 2024 · b80cbae · b80cbae
2 parents f0f1573 + 4d6340c
commit b80cbae
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 40 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="src/AbstractOptions.php">
     <DocblockTypeContradiction>
       <code><![CDATA[! is_array($options) && ! $options instanceof Traversable]]></code>
@@ -25,6 +25,9 @@
     <DocblockTypeContradiction>
       <code><![CDATA[! is_array($data) && ! is_object($data)]]></code>
     </DocblockTypeContradiction>
+    <InvalidCast>
+      <code>$key</code>
+    </InvalidCast>
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$this->storage]]></code>
     </InvalidPropertyAssignmentValue>
@@ -71,9 +74,6 @@
     </UnsupportedReferenceUsage>
   </file>
   <file src="src/ArrayUtils.php">
-    <MixedArgumentTypeCoercion>
-      <code>$callback</code>
-    </MixedArgumentTypeCoercion>
     <MixedAssignment>
       <code>$a[$key]</code>
       <code>$a[$key]</code>
@@ -217,7 +217,7 @@
       <code>$priority</code>
     </InvalidArgument>
     <MethodSignatureMismatch>
-      <code>public function insert($datum, $priority)</code>
+      <code>public function insert($value, $priority)</code>
     </MethodSignatureMismatch>
     <MethodSignatureMustProvideReturnType>
       <code>insert</code>
@@ -370,8 +370,6 @@
   <file src="test/FastPriorityQueueTest.php">
     <MixedAssignment>
       <code>$datum</code>
-      <code>$item</code>
-      <code>$test[]</code>
       <code>$test[]</code>
       <code>$test[]</code>
       <code>$test[]</code>

diff --git a/src/ArrayObject.php b/src/ArrayObject.php
@@ -333,27 +333,27 @@ public function &offsetGet(mixed $key)
     /**
      * Sets the value at the specified key to value
      *
-     * @param TKey $key
+     * @param TKey $offset
      * @param TValue $value
      * @return void
      */
     #[ReturnTypeWillChange]
-    public function offsetSet(mixed $key, mixed $value)
+    public function offsetSet(mixed $offset, mixed $value)
     {
-        $this->storage[$key] = $value;
+        $this->storage[$offset] = $value;
     }
 
     /**
      * Unsets the value at the specified key
      *
-     * @param TKey $key
+     * @param TKey $offset
      * @return void
      */
     #[ReturnTypeWillChange]
-    public function offsetUnset(mixed $key)
+    public function offsetUnset(mixed $offset)
     {
-        if ($this->offsetExists($key)) {
-            unset($this->storage[$key]);
+        if ($this->offsetExists($offset)) {
+            unset($this->storage[$offset]);
         }
     }
 

diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
@@ -357,7 +357,7 @@ protected function getQueue()
             if (! $this->queue instanceof \SplPriorityQueue) {
                 throw new Exception\DomainException(sprintf(
                     'PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"',
-                    $this->queue::class
+                    $queue::class
                 ));
             }
         }

diff --git a/src/SplPriorityQueue.php b/src/SplPriorityQueue.php
@@ -37,17 +37,17 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
      * Utilizes {@var $serial} to ensure that values of equal priority are
      * emitted in the same order in which they are inserted.
      *
-     * @param  TValue    $datum
+     * @param  TValue    $value
      * @param  TPriority $priority
      * @return void
      */
-    public function insert($datum, $priority)
+    public function insert($value, $priority)
     {
         if (! is_array($priority)) {
             $priority = [$priority, $this->serial--];
         }
 
-        parent::insert($datum, $priority);
+        parent::insert($value, $priority);
     }
 
     /**