Merge remote-tracking branch 'origin/AC-3160-fix-deprecation-issues-part10' into delivery-bunch-w22

Author: andrewbess

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/Category/Plugin/StorageTest.php

@@ -15,6 +15,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\ImportExport\Model\Import;
@@ -67,6 +68,9 @@ class StorageTest extends TestCase
     /** @var Data */
     private $importDataResource;
 
+    /** @var Write */
+    private $mediaDirectory;
+
     /**
      * @inheritdoc
      */
@@ -85,6 +89,7 @@ protected function setUp(): void
         $this->importDataResource = $this->objectManager->get(Data::class);
         $this->appParams = Bootstrap::getInstance()->getBootstrap()->getApplication()
             ->getInitParams()[AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+        $this->mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
     }
 
     /**
@@ -182,17 +187,14 @@ private function prepareFile(string $fileName): Csv
      */
     private function updateUploader(): void
     {
+        $mediaDir = !$this->mediaDirectory->getDriver() instanceof File ?
+            DirectoryList::MEDIA : $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH];
+        $destDir = $mediaDir . DIRECTORY_SEPARATOR . $this->mediaConfig->getBaseMediaPath();
+        $tmpDir =  $mediaDir . DIRECTORY_SEPARATOR . 'import';
+        $this->mediaDirectory->create($this->mediaConfig->getBaseMediaPath());
+        $this->mediaDirectory->create('import');
+        $this->import->setParameters([Import::FIELD_NAME_IMG_FILE_DIR => $tmpDir]);
         $uploader = $this->import->getUploader();
-        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
-        $destDir = $rootDirectory->getRelativePath(
-            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
-            . DIRECTORY_SEPARATOR . $this->mediaConfig->getBaseMediaPath()
-        );
-        $tmpDir = $rootDirectory->getRelativePath(
-            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
-        );
-        $rootDirectory->create($destDir);
-        $rootDirectory->create($tmpDir);
         $uploader->setDestDir($destDir);
         $uploader->setTmpDir($tmpDir);
     }

lib/internal/Magento/Framework/View/Element/Template/File/Validator.php

@@ -9,15 +9,12 @@
 use Magento\Framework\Component\ComponentRegistrar;
 use \Magento\Framework\Filesystem\Driver\File as FileDriver;
 
-/**
- * Class Validator
- */
 class Validator
 {
     /**
      * Config path to 'Allow Symlinks' template settings
      */
-    const XML_PATH_TEMPLATE_ALLOW_SYMLINK = 'dev/template/allow_symlink';
+    public const XML_PATH_TEMPLATE_ALLOW_SYMLINK = 'dev/template/allow_symlink';
 
     /**
      * Template files map
@@ -140,7 +137,7 @@ protected function isPathInDirectories($path, $directories)
         }
         $realPath = $this->fileDriver->getRealPath($path);
         foreach ($directories as $directory) {
-            if (0 === strpos($realPath, $directory)) {
+            if ($directory !== null && 0 === strpos($realPath, $directory)) {
                 return true;
             }
         }

lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php

@@ -8,15 +8,12 @@
 use Magento\Framework\Config\Dom;
 use Magento\Framework\Config\ValidationStateInterface;
 
-/**
- * Class DomMerger
- */
 class DomMerger implements DomMergerInterface
 {
     /**
      * Format of items in errors array to be used by default. Available placeholders - fields of \LibXMLError.
      */
-    const ERROR_FORMAT_DEFAULT = "Message: %message%\nLine: %line%\n";
+    public const ERROR_FORMAT_DEFAULT = "Message: %message%\nLine: %line%\n";
 
     /**
      * @var \Magento\Framework\Config\ValidationStateInterface
@@ -45,15 +42,11 @@ class DomMerger implements DomMergerInterface
     protected $idAttributes = [];
 
     /**
-     * Context XPath
-     *
      * @var array
      */
     protected $contextXPath = [];
 
     /**
-     * Is merge simple XML Element
-     *
      * @var bool
      */
     protected $isMergeSimpleXMLElement;
@@ -152,7 +145,7 @@ protected function mergeAttributes(\DOMElement $baseNode, \DOMNode $mergeNode)
     protected function createXPath(\DOMNode $node)
     {
         $parentXPath = '';
-        $currentXPath = $node->getNodePath();
+        $currentXPath = $node->getNodePath() ?? '';
         if ($node->parentNode !== null && !$node->isSameNode($node->parentNode)) {
             $parentXPath = $this->createXPath($node->parentNode);
             $pathParts = explode('/', $currentXPath);
@@ -187,6 +180,7 @@ protected function createXPath(\DOMNode $node)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     protected function nestedMerge(\DOMXPath $rootDomXPath, \DOMNodeList $insertedNodes, \DOMNode $contextNode)
     {
@@ -236,6 +230,7 @@ protected function nestedMerge(\DOMXPath $rootDomXPath, \DOMNodeList $insertedNo
             }
         }
     }
+    // phpcs:enable Generic.Metrics.NestingLevel
 
     /**
      * Append child node

lib/internal/Magento/Framework/View/FileSystem.php

@@ -171,7 +171,7 @@ public function getEmailTemplateFileName($fileId, array $params, $module)
      */
     public static function normalizePath($path)
     {
-        $parts = explode('/', $path);
+        $parts = $path !== null ? explode('/', $path) : [];
         $result = [];
 
         foreach ($parts as $part) {

lib/internal/Magento/Framework/View/Layout/Data/Structure.php

@@ -77,7 +77,7 @@ public function createStructuralElement($name, $type, $class)
      */
     protected function _generateAnonymousName($class)
     {
-        $position = strpos($class, '\\Block\\');
+        $position = $class !== null ? strpos($class, '\\Block\\') : '';
         $key = $position !== false ? substr($class, $position + 7) : $class;
         $key = strtolower(trim($key, '_'));