From ab7b43a64fb1479130c9c1b35c44ce99eb6ebd7c Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Mon, 11 Dec 2023 04:55:21 -0500 Subject: [PATCH 1/5] Make compatible with 8.2 ArrayIterator interface updates --- .../Runtime/Collection/CollectionIterator.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Propel/Runtime/Collection/CollectionIterator.php b/src/Propel/Runtime/Collection/CollectionIterator.php index eb3468389..718972626 100644 --- a/src/Propel/Runtime/Collection/CollectionIterator.php +++ b/src/Propel/Runtime/Collection/CollectionIterator.php @@ -248,8 +248,9 @@ public function append($value): void /** * @param int $flags Not used * - * @return bool + * @return true */ + #[\ReturnTypeWillChange] public function asort(int $flags = SORT_REGULAR): bool { parent::asort(); @@ -261,8 +262,9 @@ public function asort(int $flags = SORT_REGULAR): bool /** * @param int $flags Not used * - * @return bool + * @return true */ + #[\ReturnTypeWillChange] public function ksort(int $flags = SORT_REGULAR): bool { parent::ksort(); @@ -274,8 +276,9 @@ public function ksort(int $flags = SORT_REGULAR): bool /** * @param callable $callback * - * @return bool + * @return true */ + #[\ReturnTypeWillChange] public function uasort($callback): bool { parent::uasort($callback); @@ -287,8 +290,9 @@ public function uasort($callback): bool /** * @param callable $callback * - * @return bool + * @return true */ + #[\ReturnTypeWillChange] public function uksort($callback): bool { parent::uksort($callback); @@ -298,8 +302,9 @@ public function uksort($callback): bool } /** - * @return bool + * @return true */ + #[\ReturnTypeWillChange] public function natsort(): bool { parent::natsort(); @@ -309,8 +314,9 @@ public function natsort(): bool } /** - * @return bool + * @return true */ + #[\ReturnTypeWillChange] public function natcasesort(): bool { parent::natcasesort(); From 37a77ee1b57c10ca27776762171ee88baf6551c2 Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Mon, 11 Dec 2023 05:08:55 -0500 Subject: [PATCH 2/5] Unrelated CS fixes - bad master branch --- src/Propel/Generator/Platform/DefaultPlatform.php | 2 +- src/Propel/Generator/Platform/PlatformInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propel/Generator/Platform/DefaultPlatform.php b/src/Propel/Generator/Platform/DefaultPlatform.php index 72f2da936..9bd06ff8f 100644 --- a/src/Propel/Generator/Platform/DefaultPlatform.php +++ b/src/Propel/Generator/Platform/DefaultPlatform.php @@ -492,7 +492,7 @@ public function getColumnDefaultValueDDL(Column $col): string * // '"foo","bar"' * * - * @param \Propel\Generator\Model\Column[] $columns + * @param Array<\Propel\Generator\Model\Column> $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string diff --git a/src/Propel/Generator/Platform/PlatformInterface.php b/src/Propel/Generator/Platform/PlatformInterface.php index 09c5c4d40..727fca855 100644 --- a/src/Propel/Generator/Platform/PlatformInterface.php +++ b/src/Propel/Generator/Platform/PlatformInterface.php @@ -143,7 +143,7 @@ public function getColumnDefaultValueDDL(Column $col): string; * // '"foo","bar"' * * - * @param \Propel\Generator\Model\Column[]|string[] $columns + * @param Array<\Propel\Generator\Model\Column>|Array $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string From 3f514b6a66e173e00161d6b9cafeddc905f298ec Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Mon, 11 Dec 2023 05:17:05 -0500 Subject: [PATCH 3/5] Case correction --- src/Propel/Generator/Platform/DefaultPlatform.php | 2 +- src/Propel/Generator/Platform/PlatformInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propel/Generator/Platform/DefaultPlatform.php b/src/Propel/Generator/Platform/DefaultPlatform.php index 9bd06ff8f..a88d6b541 100644 --- a/src/Propel/Generator/Platform/DefaultPlatform.php +++ b/src/Propel/Generator/Platform/DefaultPlatform.php @@ -492,7 +492,7 @@ public function getColumnDefaultValueDDL(Column $col): string * // '"foo","bar"' * * - * @param Array<\Propel\Generator\Model\Column> $columns + * @param array<\Propel\Generator\Model\Column> $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string diff --git a/src/Propel/Generator/Platform/PlatformInterface.php b/src/Propel/Generator/Platform/PlatformInterface.php index 727fca855..8e5470094 100644 --- a/src/Propel/Generator/Platform/PlatformInterface.php +++ b/src/Propel/Generator/Platform/PlatformInterface.php @@ -143,7 +143,7 @@ public function getColumnDefaultValueDDL(Column $col): string; * // '"foo","bar"' * * - * @param Array<\Propel\Generator\Model\Column>|Array $columns + * @param array<\Propel\Generator\Model\Column>|array $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string From 85c78d5b3469c22b6ac5abfaaf829173e8c05d8e Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Mon, 11 Dec 2023 05:29:33 -0500 Subject: [PATCH 4/5] Fiddle with shit for phpcs --- src/Propel/Generator/Platform/DefaultPlatform.php | 2 +- src/Propel/Generator/Platform/PlatformInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propel/Generator/Platform/DefaultPlatform.php b/src/Propel/Generator/Platform/DefaultPlatform.php index a88d6b541..7d73d1c3e 100644 --- a/src/Propel/Generator/Platform/DefaultPlatform.php +++ b/src/Propel/Generator/Platform/DefaultPlatform.php @@ -492,7 +492,7 @@ public function getColumnDefaultValueDDL(Column $col): string * // '"foo","bar"' * * - * @param array<\Propel\Generator\Model\Column> $columns + * @param array $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string diff --git a/src/Propel/Generator/Platform/PlatformInterface.php b/src/Propel/Generator/Platform/PlatformInterface.php index 8e5470094..7eebd45ea 100644 --- a/src/Propel/Generator/Platform/PlatformInterface.php +++ b/src/Propel/Generator/Platform/PlatformInterface.php @@ -143,7 +143,7 @@ public function getColumnDefaultValueDDL(Column $col): string; * // '"foo","bar"' * * - * @param array<\Propel\Generator\Model\Column>|array $columns + * @param array|string[] $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string From 923c2487c4b79ecdec19f68340c28637f6b75519 Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Mon, 11 Dec 2023 05:41:37 -0500 Subject: [PATCH 5/5] Revert unnecessary phpcs linting changes --- src/Propel/Generator/Platform/DefaultPlatform.php | 2 +- src/Propel/Generator/Platform/PlatformInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propel/Generator/Platform/DefaultPlatform.php b/src/Propel/Generator/Platform/DefaultPlatform.php index 7d73d1c3e..a88d6b541 100644 --- a/src/Propel/Generator/Platform/DefaultPlatform.php +++ b/src/Propel/Generator/Platform/DefaultPlatform.php @@ -492,7 +492,7 @@ public function getColumnDefaultValueDDL(Column $col): string * // '"foo","bar"' * * - * @param array $columns + * @param array<\Propel\Generator\Model\Column> $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string diff --git a/src/Propel/Generator/Platform/PlatformInterface.php b/src/Propel/Generator/Platform/PlatformInterface.php index 7eebd45ea..8e5470094 100644 --- a/src/Propel/Generator/Platform/PlatformInterface.php +++ b/src/Propel/Generator/Platform/PlatformInterface.php @@ -143,7 +143,7 @@ public function getColumnDefaultValueDDL(Column $col): string; * // '"foo","bar"' * * - * @param array|string[] $columns + * @param array<\Propel\Generator\Model\Column>|array $columns * @param string $delimiter The delimiter to use in separating the column names. * * @return string