Skip to content

Commit b80cbae

Browse files
authored
Merge pull request #112 from laminas/renovate/lock-file-maintenance
Lock file maintenance
2 parents f0f1573 + 4d6340c commit b80cbae

File tree

5 files changed

+39
-40
lines changed

5 files changed

+39
-40
lines changed

composer.lock

Lines changed: 23 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

psalm-baseline.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
2+
<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
33
<file src="src/AbstractOptions.php">
44
<DocblockTypeContradiction>
55
<code><![CDATA[! is_array($options) && ! $options instanceof Traversable]]></code>
@@ -25,6 +25,9 @@
2525
<DocblockTypeContradiction>
2626
<code><![CDATA[! is_array($data) && ! is_object($data)]]></code>
2727
</DocblockTypeContradiction>
28+
<InvalidCast>
29+
<code>$key</code>
30+
</InvalidCast>
2831
<InvalidPropertyAssignmentValue>
2932
<code><![CDATA[$this->storage]]></code>
3033
</InvalidPropertyAssignmentValue>
@@ -71,9 +74,6 @@
7174
</UnsupportedReferenceUsage>
7275
</file>
7376
<file src="src/ArrayUtils.php">
74-
<MixedArgumentTypeCoercion>
75-
<code>$callback</code>
76-
</MixedArgumentTypeCoercion>
7777
<MixedAssignment>
7878
<code>$a[$key]</code>
7979
<code>$a[$key]</code>
@@ -217,7 +217,7 @@
217217
<code>$priority</code>
218218
</InvalidArgument>
219219
<MethodSignatureMismatch>
220-
<code>public function insert($datum, $priority)</code>
220+
<code>public function insert($value, $priority)</code>
221221
</MethodSignatureMismatch>
222222
<MethodSignatureMustProvideReturnType>
223223
<code>insert</code>
@@ -370,8 +370,6 @@
370370
<file src="test/FastPriorityQueueTest.php">
371371
<MixedAssignment>
372372
<code>$datum</code>
373-
<code>$item</code>
374-
<code>$test[]</code>
375373
<code>$test[]</code>
376374
<code>$test[]</code>
377375
<code>$test[]</code>

src/ArrayObject.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,27 +333,27 @@ public function &offsetGet(mixed $key)
333333
/**
334334
* Sets the value at the specified key to value
335335
*
336-
* @param TKey $key
336+
* @param TKey $offset
337337
* @param TValue $value
338338
* @return void
339339
*/
340340
#[ReturnTypeWillChange]
341-
public function offsetSet(mixed $key, mixed $value)
341+
public function offsetSet(mixed $offset, mixed $value)
342342
{
343-
$this->storage[$key] = $value;
343+
$this->storage[$offset] = $value;
344344
}
345345

346346
/**
347347
* Unsets the value at the specified key
348348
*
349-
* @param TKey $key
349+
* @param TKey $offset
350350
* @return void
351351
*/
352352
#[ReturnTypeWillChange]
353-
public function offsetUnset(mixed $key)
353+
public function offsetUnset(mixed $offset)
354354
{
355-
if ($this->offsetExists($key)) {
356-
unset($this->storage[$key]);
355+
if ($this->offsetExists($offset)) {
356+
unset($this->storage[$offset]);
357357
}
358358
}
359359

src/PriorityQueue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ protected function getQueue()
357357
if (! $this->queue instanceof \SplPriorityQueue) {
358358
throw new Exception\DomainException(sprintf(
359359
'PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"',
360-
$this->queue::class
360+
$queue::class
361361
));
362362
}
363363
}

src/SplPriorityQueue.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
3737
* Utilizes {@var $serial} to ensure that values of equal priority are
3838
* emitted in the same order in which they are inserted.
3939
*
40-
* @param TValue $datum
40+
* @param TValue $value
4141
* @param TPriority $priority
4242
* @return void
4343
*/
44-
public function insert($datum, $priority)
44+
public function insert($value, $priority)
4545
{
4646
if (! is_array($priority)) {
4747
$priority = [$priority, $this->serial--];
4848
}
4949

50-
parent::insert($datum, $priority);
50+
parent::insert($value, $priority);
5151
}
5252

5353
/**

0 commit comments

Comments
 (0)