Merge pull request #1595 from endelwar/fix-phpunit-test-warnings

garak · web-flow · commit 8fe09f40124e · 2026-06-02T16:34:57.000+02:00
Fix "null as array offset" deprecation in FileExtensionTrait
diff --git a/src/Naming/Polyfill/FileExtensionTrait.php b/src/Naming/Polyfill/FileExtensionTrait.php
@@ -50,7 +50,7 @@ private function getExtensionWithOption(File $file, bool $keepOriginal): ?string
             return $this->getOriginalExtension($file);
         }
 
-        if ('' !== ($extension = $file->guessExtension())) {
+        if (null !== ($extension = $file->guessExtension()) && '' !== $extension) {
             if (isset(self::$keep[$extension])) {
                 $originalExtension = \pathinfo($file->getClientOriginalName(), \PATHINFO_EXTENSION);
                 if (\in_array($originalExtension, self::$keep[$extension], true)) {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private function getExtensionWithOption(File $file, bool $keepOriginal): ?string`
`50`	`50`	`return $this->getOriginalExtension($file);`
`51`	`51`	`}`
`52`	`52`
`53`		`- if ('' !== ($extension = $file->guessExtension())) {`
	`53`	`+ if (null !== ($extension = $file->guessExtension()) && '' !== $extension) {`
`54`	`54`	`if (isset(self::$keep[$extension])) {`
`55`	`55`	`$originalExtension = \pathinfo($file->getClientOriginalName(), \PATHINFO_EXTENSION);`
`56`	`56`	`if (\in_array($originalExtension, self::$keep[$extension], true)) {`