#34505: fixes after CR

Author: karyna-t

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -960,7 +960,8 @@ public function getAbsolutePath($basePath, $path, $scheme = null)
         // check if the path given is already an absolute path containing the
         // basepath. so if the basepath starts at position 0 in the path, we
         // must not concatinate them again because path is already absolute.
-        if ($path && strpos($path, $basePath) === 0) {
+        $path = $path !== null ? $path : '';
+        if ('' !== $basePath && strpos($path, $basePath) === 0) {
             return $this->getScheme($scheme) . $path;
         }
 
@@ -976,7 +977,7 @@ public function getAbsolutePath($basePath, $path, $scheme = null)
      */
     public function getRelativePath($basePath, $path = null)
     {
-        $path = $this->fixSeparator($path);
+        $path = $path !== null ? $this->fixSeparator($path) : '';
         if (strpos($path, $basePath) === 0 || $basePath == $path . '/') {
             $result = substr($path, strlen($basePath));
         } else {
@@ -995,7 +996,7 @@ public function getRelativePath($basePath, $path = null)
      */
     protected function fixSeparator($path)
     {
-        return $path ? str_replace('\\', '/', $path) : '';
+        return str_replace('\\', '/', $path);
     }
 
     /**

lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php

@@ -53,6 +53,8 @@ public function dataProviderForTestGetAbsolutePath(): array
             ['/root/path/', '/sub', '/root/path/sub'],
             ['/root/path/', '../sub', '/root/path/../sub'],
             ['/root/path/', '/root/path/sub', '/root/path/sub'],
+            ['', '', ''],
+            ['0', '0', '0']
         ];
     }
 
@@ -82,6 +84,8 @@ public function dataProviderForTestGetRelativePath(): array
             ['/root/path/', '/sub', '/sub'],
             ['/root/path/', '/root/path/sub', 'sub'],
             ['/root/path/sub', '/root/path/other', '/root/path/other'],
+            ['/root/path/', '', ''],
+            ['0', '0', '']
         ];
     }
 

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -310,9 +310,11 @@ public function formatDateTime(
         }
 
         $formatter = $this->dateFormatterFactory->create(
-            (string) $locale ?: $this->_localeResolver->getLocale(),
-            (int) $dateType ?: \IntlDateFormatter::SHORT,
-            (int) $timeType ?: \IntlDateFormatter::SHORT,
+            (string) ($locale ?: $this->_localeResolver->getLocale()),
+            // @phpstan-ignore-next-line
+            (int) ($dateType ?? \IntlDateFormatter::SHORT),
+            // @phpstan-ignore-next-line
+            (int) ($timeType ?? \IntlDateFormatter::SHORT),
             null,
             false
         );