Prepare PHP 8 compatibility #5813
Merged
Conversation
This file contains 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
| @@ -54,7 +54,7 @@ public function provide($entity, $name) | |||
| $locale = $this->translator->getLocale(); | |||
|
|
|||
| try { | |||
| if (\method_exists($entity, 'getLocale')) { | |||
| if (\is_object($entity) && \method_exists($entity, 'getLocale')) { | |||
There was a problem hiding this comment.
| @@ -214,7 +214,7 @@ protected function processPut($entities, $requestEntities, $deleteCallback, $upd | |||
| // FIXME: this is just a hack to avoid relations that start with index != 0 | |||
| // FIXME: otherwise deserialization process will parse relations as object instead of an array | |||
| // reindex entities | |||
| if (\count($entities) > 0 && \method_exists($entities, 'getValues')) { | |||
| if (\count($entities) > 0 && \is_object($entities) && \method_exists($entities, 'getValues')) { | |||
There was a problem hiding this comment.
| @@ -250,7 +250,8 @@ public function extractSnippetTypeFromPath($path) | |||
| $newPath = PathHelper::getParentPath($path); | |||
| $newPath = \substr($newPath, \strlen($snippetsPath)); | |||
|
|
|||
| if (false === $newPath) { | |||
| // $newPath can be false or empty because of return difference of substr depending on php version (<= 7.4, 8.0) | |||
| if (!$newPath) { | |||
There was a problem hiding this comment.
| @@ -105,16 +105,26 @@ public function provideSortObjects() | |||
| '[foo]', ['2', '1', '3'], | |||
| ], | |||
|
|
|||
| // multi dimensional array missing key | |||
| // multi dimensional array missing key asc | |||
There was a problem hiding this comment.
See also https://3v4l.org/LsUj7
alexander-schranz
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What's in this PR?
Add PHP 8 compatibility
Why?
This fixes codes which are needed for the PHP 8 compatibility to be changed. See also #5757