Skip to content

Commit 9157085

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Filesystem] Fix str_contains deprecation [Security] Correctly initialize the voter property [ErrorHandler] Skip failing tests when "xdebug.file_link_format" option is defined [FrameworkBundle] Fix typo Update `changed-translation-files` step with native git diff command [DependencyInjection] fix XmlDumper when a tag contains also a 'name' property [Lock] Check the correct SQLSTATE error code for MySQL [ErrorHandler] Fix `ErrorHandlerTest::tearDown()` visibility [Lock] compatiblity with redis cluster 7 fix: typo [Messenger] trigger retry logic when message is a redelivery [PropertyAccess] Fix checking for missing properties add missing invalid extension error entry
2 parents 2890e3a + b9c09ee commit 9157085

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Filesystem.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private static function doRemove(array $files, bool $isRecursive): void
190190

191191
throw new IOException(sprintf('Failed to remove directory "%s": ', $file).$lastError);
192192
}
193-
} elseif (!self::box('unlink', $file) && (str_contains(self::$lastError, 'Permission denied') || file_exists($file))) {
193+
} elseif (!self::box('unlink', $file) && ((self::$lastError && str_contains(self::$lastError, 'Permission denied')) || file_exists($file))) {
194194
throw new IOException(sprintf('Failed to remove file "%s": ', $file).self::$lastError);
195195
}
196196
}

0 commit comments

Comments
 (0)