[Filesystem] Fix str_contains deprecation #54298
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
stof
reviewed
Mar 15, 2024
| @@ -396,7 +396,7 @@ public function hardlink(string $originFile, $targetFiles) | |||
| private function linkException(string $origin, string $target, string $linkType) | |||
| { | |||
| if (self::$lastError) { | |||
| if ('\\' === \DIRECTORY_SEPARATOR && str_contains(self::$lastError, 'error code(1314)')) { | |||
| if ('\\' === \DIRECTORY_SEPARATOR && str_contains((string) self::$lastError, 'error code(1314)')) { | |||
There was a problem hiding this comment.
this change is wrong. It cannot be null here due to the surrounding if (self::$lastError)
| @@ -199,7 +199,7 @@ private static function doRemove(array $files, bool $isRecursive): void | |||
|
|
|||
| throw new IOException(sprintf('Failed to remove directory "%s": ', $file).$lastError); | |||
| } | |||
| } elseif (!self::box('unlink', $file) && (str_contains(self::$lastError, 'Permission denied') || file_exists($file))) { | |||
| } elseif (!self::box('unlink', $file) && (str_contains((string) self::$lastError, 'Permission denied') || file_exists($file))) { | |||
There was a problem hiding this comment.
I'd rather use self::$lastError && str_contains(self::$lastError, 'Permission denied') here to make the intent easier to understand here (handling the case where there is no last error)
NeilPeyssard
force-pushed
the
fix/54291-str-contains-deprecation
branch
from
8003acc
to
d7519b7
Compare
derrabus
approved these changes
Mar 15, 2024
GromNaN
approved these changes
Mar 15, 2024
xabbuh
approved these changes
Mar 15, 2024
|
Thank you @NeilPeyssard. |
This was referenced Apr 2, 2024
Merged
Merged
Merged
github-merge-queue bot
pushed a commit
to Lendable/composer-license-checker
that referenced
this pull request
Apr 4, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [symfony/filesystem](https://symfony.com) ([source](https://togithub.com/symfony/filesystem)) | `6.4.3` -> `6.4.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>symfony/filesystem (symfony/filesystem)</summary> ### [`v6.4.6`](https://togithub.com/symfony/filesystem/releases/tag/v6.4.6) [Compare Source](https://togithub.com/symfony/filesystem/compare/v6.4.3...v6.4.6) **Changelog** (symfony/filesystem@v6.4.5...v6.4.6) - bug [symfony/symfony#54362](https://togithub.com/symfony/symfony/issues/54362) \[Filesystem] preserve the file modification time when mirroring directories ([@​xabbuh](https://togithub.com/xabbuh)) - bug [symfony/symfony#54298](https://togithub.com/symfony/symfony/issues/54298) \[Filesystem] Fix str_contains deprecation ([@​NeilPeyssard](https://togithub.com/NeilPeyssard)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Lendable/composer-license-checker). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNjkuMiIsInVwZGF0ZWRJblZlciI6IjM3LjI2OS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
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.
In the Filesystem component,
str_containsis potentially called with null as a first parameter. This is deprecated since PHP 8.1.