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
propelorm · Feb 4, 2024 · 6fd10bf · 6fd10bf
1 parent 8d22484
commit 6fd10bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git 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"'
      * </code>
      *
-     * @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
@@ -143,7 +143,7 @@ public function getColumnDefaultValueDDL(Column $col): string;
      * // '"foo","bar"'
      * </code>
      *
-     * @param \Propel\Generator\Model\Column[]|string[] $columns
+     * @param array<\Propel\Generator\Model\Column>|array<string> $columns
      * @param string $delimiter The delimiter to use in separating the column names.
      *
      * @return string

diff --git 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();