AC-6437:Ensure PHP8.1 Support after 7.4 removal - Handled null errors for pathinfo

Author: faizan-shk

app/code/Magento/Deploy/Collector/Collector.php

@@ -93,7 +93,7 @@ public function collect()
                 if ($file->getModule() && !$this->moduleManager->isEnabled($file->getModule())) {
                     continue;
                 }
-                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
+                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName() ?? ''));
                 $params = $this->getParams($file);
                 $packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}";
                 if (!isset($packages[$packagePath])) {

app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php

@@ -95,7 +95,7 @@ public function process(Package $package, array $options)
                 if ($packageFile && $packageFile->getOrigPackage() === $package) {
                     continue;
                 }
-                $deployFileName = $this->fileNameResolver->resolve($file->getFileName());
+                $deployFileName = $this->fileNameResolver->resolve($file->getFileName() ?? '');
                 if ($deployFileName !== $file->getFileName()) {
                     if ($this->hasOverrides($file, $package)) {
                         $file = clone $file;

app/code/Magento/Deploy/Service/DeployStaticFile.php

@@ -6,6 +6,8 @@
 namespace Magento\Deploy\Service;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\File\WriteInterface;
 use Magento\Framework\View\Asset\Minification;
@@ -83,8 +85,9 @@ public function __construct(
      * @param string $fileName
      * @param array $params ['area' =>, 'theme' =>, 'locale' =>, 'module' =>]
      * @return string
+     * @throws LocalizedException
      */
-    public function deployFile($fileName, array $params = [])
+    public function deployFile(string $fileName, array $params = []): string
     {
         $params['publish'] = true;
         $asset = $this->assetRepo->createAsset($this->resolveFile($fileName), $params);
@@ -97,8 +100,9 @@ public function deployFile($fileName, array $params = [])
     /**
      * @param string $path
      * @return void
+     * @throws FileSystemException
      */
-    public function deleteFile($path)
+    public function deleteFile(string $path)
     {
         if ($this->pubStaticDir->isExist($path)) {
             $absolutePath = $this->pubStaticDir->getAbsolutePath($path);
@@ -120,8 +124,9 @@ public function deleteFile($path)
      * @param string $fileName
      * @param string $filePath
      * @return string|false
+     * @throws FileSystemException
      */
-    public function readFile($fileName, $filePath)
+    public function readFile(string $fileName, string $filePath): bool|string
     {
         $fileName = $this->minification->addMinifiedSign($fileName);
         $relativePath = $filePath . DIRECTORY_SEPARATOR . $this->resolveFile($fileName);
@@ -137,7 +142,7 @@ public function readFile($fileName, $filePath)
      * @param string $filePath
      * @return WriteInterface
      */
-    public function openFile($fileName, $filePath)
+    public function openFile(string $fileName, string $filePath): WriteInterface
     {
         $relativePath = $filePath . DIRECTORY_SEPARATOR . $this->resolveFile($fileName);
         return $this->pubStaticDir->openFile($relativePath, 'w+');
@@ -150,8 +155,9 @@ public function openFile($fileName, $filePath)
      * @param string $filePath
      * @param string $content
      * @return int The number of bytes that were written.
+     * @throws FileSystemException
      */
-    public function writeFile($fileName, $filePath, $content)
+    public function writeFile(string $fileName, string $filePath, string $content): int
     {
         $relativePath = $filePath . DIRECTORY_SEPARATOR . $this->resolveFile($fileName);
         return $this->pubStaticDir->writeFile($relativePath, $content);
@@ -164,8 +170,9 @@ public function writeFile($fileName, $filePath, $content)
      * @param string $sourcePath
      * @param string $targetPath
      * @return bool
+     * @throws FileSystemException
      */
-    public function copyFile($fileName, $sourcePath, $targetPath)
+    public function copyFile(string $fileName, string $sourcePath, string $targetPath): bool
     {
         $fileName = $this->minification->addMinifiedSign($fileName);
         return $this->pubStaticDir->copyFile(
@@ -179,9 +186,10 @@ public function copyFile($fileName, $sourcePath, $targetPath)
      *
      * @param string $fileName
      * @param string $filePath
-     * @return string
+     * @return bool|string
+     * @throws FileSystemException
      */
-    public function readTmpFile($fileName, $filePath)
+    public function readTmpFile(string $fileName, string $filePath): bool|string
     {
         $relativePath = $filePath . DIRECTORY_SEPARATOR . $fileName;
         return $this->tmpDir->isFile($relativePath) ? $this->tmpDir->readFile($relativePath) : false;
@@ -194,10 +202,12 @@ public function readTmpFile($fileName, $filePath)
      * @param string $filePath
      * @param string $content
      * @return int The number of bytes that were written.
+     * @throws FileSystemException
      */
-    public function writeTmpFile($fileName, $filePath, $content)
+    public function writeTmpFile(string $fileName, string $filePath, string $content): int
     {
         $relativePath = $filePath . DIRECTORY_SEPARATOR . $this->resolveFile($fileName);
+
         return $this->tmpDir->writeFile($relativePath, $content);
     }
 
@@ -207,14 +217,12 @@ public function writeTmpFile($fileName, $filePath, $content)
      * @param string $fileName
      * @return string
      */
-    private function resolveFile($fileName)
+    private function resolveFile(string $fileName): string
     {
-        $compiledFile = str_replace(
+        return str_replace(
             Repository::FILE_ID_SEPARATOR,
             '/',
             $this->fileNameResolver->resolve($fileName)
         );
-
-        return $compiledFile;
     }
 }

lib/internal/Magento/Framework/Reflection/TypeProcessor.php

@@ -547,7 +547,7 @@ public function getParamType(ParameterReflection $param)
             return strpos($paramType, '[]') !== false ? $paramType : "{$paramType}[]";
         }
 
-        return $this->resolveFullyQualifiedClassName($param->getDeclaringClass(), $type);
+        return $this->resolveFullyQualifiedClassName($param->getDeclaringClass(), $type ?? '');
     }
 
     /**

lib/internal/Magento/Framework/View/Asset/PreProcessor/FileNameResolver.php

@@ -36,20 +36,17 @@ function (AlternativeSourceInterface $alternativeSource) {
      * @param string $fileName
      * @return string
      */
-    public function resolve($fileName)
+    public function resolve(string $fileName): string
     {
         $compiledFile = $fileName;
         $extension = pathinfo($fileName, PATHINFO_EXTENSION);
         foreach ($this->alternativeSources as $name => $alternative) {
-            if ($alternative->isExtensionSupported($extension)
-                && strpos(basename($fileName), '_') !== 0
-            ) {
-                $compiledFile = $fileName !== null
-                    ? substr($fileName, 0, strlen($fileName) - strlen($extension) - 1)
-                    : '';
-                $compiledFile = $compiledFile . '.' . $name;
+            if ($alternative->isExtensionSupported($extension) && !str_starts_with(basename($fileName), '_')) {
+                $compiledFile = substr($fileName, 0, strlen($fileName) - strlen($extension) - 1);
+                $compiledFile = sprintf('%s.%s', $compiledFile, $name);
             }
         }
+
         return $compiledFile;
     }
 }