PHPORM-150 Run CI on Laravel 11 #2735
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
|
|
||
| namespace MongoDB\Laravel\Eloquent; | ||
|
|
||
| use BackedEnum; | ||
| use Carbon\CarbonInterface; | ||
| use DateTimeInterface; | ||
| use Illuminate\Contracts\Queue\QueueableCollection; | ||
|
|
@@ -22,6 +23,7 @@ | |
| use MongoDB\BSON\UTCDateTime; | ||
| use MongoDB\Laravel\Query\Builder as QueryBuilder; | ||
| use Stringable; | ||
| use ValueError; | ||
|
|
||
| use function array_key_exists; | ||
| use function array_keys; | ||
|
|
@@ -38,10 +40,12 @@ | |
| use function is_string; | ||
| use function ltrim; | ||
| use function method_exists; | ||
| use function sprintf; | ||
| use function str_contains; | ||
| use function str_starts_with; | ||
| use function strcmp; | ||
| use function uniqid; | ||
| use function var_export; | ||
|
|
||
| abstract class Model extends BaseModel | ||
| { | ||
|
|
@@ -704,7 +708,7 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt | |
| } | ||
|
|
||
| if ($this->isEnumCastable($key) && (! $castValue instanceof Arrayable)) { | ||
|
There was a problem hiding this comment. The signature of this method have changed in a non-backward compatible way. So I duplicated this simple method to keep compatibility with both Laravel 10 and 11. We must keep the function |
||
| $castValue = $castValue !== null ? $this->getStorableEnumValueFromLaravel11($this->getCasts()[$key], $castValue) : null; | ||
| } | ||
|
|
||
| if ($castValue instanceof Arrayable) { | ||
|
|
@@ -717,6 +721,23 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt | |
| return $attributes; | ||
| } | ||
|
|
||
| /** | ||
| * Duplicate of {@see HasAttributes::getStorableEnumValue()} for Laravel 11 as the signature of the method has | ||
| * changed in a non-backward compatible way. | ||
| * | ||
| * @todo Remove this method when support for Laravel 10 is dropped. | ||
| */ | ||
| private function getStorableEnumValueFromLaravel11($expectedEnum, $value) | ||
| { | ||
| if (! $value instanceof $expectedEnum) { | ||
| throw new ValueError(sprintf('Value [%s] is not of the expected enum type [%s].', var_export($value, true), $expectedEnum)); | ||
| } | ||
|
|
||
| return $value instanceof BackedEnum | ||
| ? $value->value | ||
| : $value->name; | ||
| } | ||
|
|
||
| /** | ||
| * Is a value a BSON type? | ||
| * | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once Laravel 11 will be released, this will no longer be necessary. But only
low-depsjob will run Laravel 10.