Skip to content

Commit 6fd10bf

Browse files
authored
Make compatible with 8.2 ArrayIterator interface updates (#1987)
* Make compatible with 8.2 ArrayIterator interface updates * Unrelated CS fixes - bad master branch * Case correction * Fiddle with shit for phpcs * Revert unnecessary phpcs linting changes
1 parent 8d22484 commit 6fd10bf

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/Propel/Generator/Platform/DefaultPlatform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ public function getColumnDefaultValueDDL(Column $col): string
492492
* // '"foo","bar"'
493493
* </code>
494494
*
495-
* @param \Propel\Generator\Model\Column[] $columns
495+
* @param array<\Propel\Generator\Model\Column> $columns
496496
* @param string $delimiter The delimiter to use in separating the column names.
497497
*
498498
* @return string

src/Propel/Generator/Platform/PlatformInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function getColumnDefaultValueDDL(Column $col): string;
143143
* // '"foo","bar"'
144144
* </code>
145145
*
146-
* @param \Propel\Generator\Model\Column[]|string[] $columns
146+
* @param array<\Propel\Generator\Model\Column>|array<string> $columns
147147
* @param string $delimiter The delimiter to use in separating the column names.
148148
*
149149
* @return string

src/Propel/Runtime/Collection/CollectionIterator.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,9 @@ public function append($value): void
248248
/**
249249
* @param int $flags Not used
250250
*
251-
* @return bool
251+
* @return true
252252
*/
253+
#[\ReturnTypeWillChange]
253254
public function asort(int $flags = SORT_REGULAR): bool
254255
{
255256
parent::asort();
@@ -261,8 +262,9 @@ public function asort(int $flags = SORT_REGULAR): bool
261262
/**
262263
* @param int $flags Not used
263264
*
264-
* @return bool
265+
* @return true
265266
*/
267+
#[\ReturnTypeWillChange]
266268
public function ksort(int $flags = SORT_REGULAR): bool
267269
{
268270
parent::ksort();
@@ -274,8 +276,9 @@ public function ksort(int $flags = SORT_REGULAR): bool
274276
/**
275277
* @param callable $callback
276278
*
277-
* @return bool
279+
* @return true
278280
*/
281+
#[\ReturnTypeWillChange]
279282
public function uasort($callback): bool
280283
{
281284
parent::uasort($callback);
@@ -287,8 +290,9 @@ public function uasort($callback): bool
287290
/**
288291
* @param callable $callback
289292
*
290-
* @return bool
293+
* @return true
291294
*/
295+
#[\ReturnTypeWillChange]
292296
public function uksort($callback): bool
293297
{
294298
parent::uksort($callback);
@@ -298,8 +302,9 @@ public function uksort($callback): bool
298302
}
299303

300304
/**
301-
* @return bool
305+
* @return true
302306
*/
307+
#[\ReturnTypeWillChange]
303308
public function natsort(): bool
304309
{
305310
parent::natsort();
@@ -309,8 +314,9 @@ public function natsort(): bool
309314
}
310315

311316
/**
312-
* @return bool
317+
* @return true
313318
*/
319+
#[\ReturnTypeWillChange]
314320
public function natcasesort(): bool
315321
{
316322
parent::natcasesort();

0 commit comments

Comments
 (0)