bug #54298 [Filesystem] Fix str_contains deprecation (NeilPeyssard)

derrabus · derrabus · commit e05d922ab927 · 2024-03-15T13:17:22.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Filesystem] Fix str_contains deprecation | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54291 | License | MIT In the Filesystem component, `str_contains` is potentially called with null as a first parameter. This is deprecated since PHP 8.1. Commits ------- d7519b7 [Filesystem] Fix str_contains deprecation
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -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) && ((self::$lastError && str_contains(self::$lastError, 'Permission denied')) || file_exists($file))) {
                 throw new IOException(sprintf('Failed to remove file "%s": ', $file).self::$lastError);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private static function doRemove(array $files, bool $isRecursive): void`
`199`	`199`
`200`	`200`	`throw new IOException(sprintf('Failed to remove directory "%s": ', $file).$lastError);`
`201`	`201`	`}`
`202`		`- } elseif (!self::box('unlink', $file) && (str_contains(self::$lastError, 'Permission denied') \|\| file_exists($file))) {`
	`202`	`+ } elseif (!self::box('unlink', $file) && ((self::$lastError && str_contains(self::$lastError, 'Permission denied')) \|\| file_exists($file))) {`
`203`	`203`	`throw new IOException(sprintf('Failed to remove file "%s": ', $file).self::$lastError);`
`204`	`204`	`}`
`205`	`205`	`}`