Skip to content

Commit c7a7844

Browse files
gsteelgsteel
authored
Merge pull request #222 from laminas/renovate/lock-file-maintenance
Lock file maintenance
2 parents 2a60d28 + 90f9c61 commit c7a7844

File tree

4 files changed

+43
-37
lines changed

4 files changed

+43
-37
lines changed

‎composer.lock‎

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

‎psalm-baseline.xml‎

Lines changed: 1 addition & 1 deletion
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.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
2+
<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
33
<file src="bin/update_hostname_validator.php">
44
<MissingClosureParamType>
55
<code>$domain</code>

‎test/File/HashTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function testLegacy($options, $isValidParam, bool $expected, string $mess
139139
}
140140
}
141141

142-
/** @psalm-return array<array{string|string[], array<numeric, string>}> */
142+
/** @psalm-return array<array{0: numeric-string|list<numeric-string>, 1: array<int, string>}> */
143143
public static function hashProvider(): array
144144
{
145145
return [
@@ -151,8 +151,8 @@ public static function hashProvider(): array
151151
/**
152152
* Ensures that getHash() returns expected value
153153
*
154-
* @param string|string[] $hash
155-
* @psalm-param array<numeric, string> $expected
154+
* @param numeric-string|list<numeric-string> $hash
155+
* @psalm-param array<int, string> $expected
156156
*/
157157
#[DataProvider('hashProvider')]
158158
public function testGetHash($hash, array $expected): void
@@ -165,8 +165,8 @@ public function testGetHash($hash, array $expected): void
165165
/**
166166
* Ensures that setHash() returns expected value
167167
*
168-
* @param string|string[] $hash
169-
* @psalm-param array<numeric, string> $expected
168+
* @param numeric-string|list<numeric-string> $hash
169+
* @psalm-param array<int, string> $expected
170170
*/
171171
#[DataProvider('hashProvider')]
172172
public function testSetHash($hash, array $expected): void

‎test/File/Sha1Test.php‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,26 @@ public function testLegacy($options, $isValidParam, bool $expected, string $mess
116116
}
117117
}
118118

119-
/** @psalm-return array<array{string|list<string>, array<numeric, string>}> */
119+
/** @return list<array{0: numeric-string|list<numeric-string>, 1: array<int, string>}> */
120120
public static function getHashProvider(): array
121121
{
122122
return [
123-
['12333', ['12333' => 'sha1']],
124-
[['12345', '12333', '12344'], ['12345' => 'sha1', '12333' => 'sha1', '12344' => 'sha1']],
123+
[
124+
'12333',
125+
[12333 => 'sha1'],
126+
],
127+
[
128+
['12345', '12333', '12344'],
129+
[12345 => 'sha1', 12333 => 'sha1', 12344 => 'sha1'],
130+
],
125131
];
126132
}
127133

128134
/**
129135
* Ensures that getSha1() returns expected value
130136
*
131-
* @psalm-param string|list<string> $hash
132-
* @psalm-param array<numeric, string> $expected
137+
* @psalm-param numeric-string|list<numeric-string> $hash
138+
* @psalm-param array<int, string> $expected
133139
*/
134140
#[DataProvider('getHashProvider')]
135141
public function testGetSha1($hash, array $expected): void
@@ -142,8 +148,8 @@ public function testGetSha1($hash, array $expected): void
142148
/**
143149
* Ensures that getHash() returns expected value
144150
*
145-
* @psalm-param string|list<string> $hash
146-
* @psalm-param array<numeric, string> $expected
151+
* @psalm-param numeric-string|list<numeric-string> $hash
152+
* @psalm-param array<int, string> $expected
147153
*/
148154
#[DataProvider('getHashProvider')]
149155
public function testGetHash($hash, array $expected): void
@@ -156,8 +162,8 @@ public function testGetHash($hash, array $expected): void
156162
/**
157163
* Ensures that setSha1() returns expected value
158164
*
159-
* @psalm-param string|list<string> $hash
160-
* @psalm-param array<numeric, string> $expected
165+
* @psalm-param numeric-string|list<numeric-string> $hash
166+
* @psalm-param array<int, string> $expected
161167
*/
162168
#[DataProvider('getHashProvider')]
163169
public function testSetSha1($hash, array $expected): void
@@ -171,8 +177,8 @@ public function testSetSha1($hash, array $expected): void
171177
/**
172178
* Ensures that setHash() returns expected value
173179
*
174-
* @psalm-param string|list<string> $hash
175-
* @psalm-param array<numeric, string> $expected
180+
* @psalm-param numeric-string|list<numeric-string> $hash
181+
* @psalm-param array<int, string> $expected
176182
*/
177183
#[DataProvider('getHashProvider')]
178184
public function testSetHash($hash, array $expected): void

0 commit comments

Comments
 (0)