Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make compatible with 8.2 ArrayIterator interface updates #1987

Merged
merged 5 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Propel/Generator/Platform/DefaultPlatform.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Platform/PlatformInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions src/Propel/Runtime/Collection/CollectionIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -298,8 +302,9 @@ public function uksort($callback): bool
}

/**
* @return bool
* @return true
*/
#[\ReturnTypeWillChange]
public function natsort(): bool
{
parent::natsort();
Expand All @@ -309,8 +314,9 @@ public function natsort(): bool
}

/**
* @return bool
* @return true
*/
#[\ReturnTypeWillChange]
public function natcasesort(): bool
{
parent::natcasesort();
Expand Down
Loading