Merge remote-tracking branch 'remotes/github/2.3-develop' into MC-15140-V2

Author: VeronikaYarats

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

app/code/Magento/AdminNotification/README.md

@@ -4,15 +4,25 @@ The Magento_AdminNotification module provides the ability to alert administrator
 
 ## Installation details
 
+The Magento_AdminNotification module creates the following tables in the database:
+- `adminnotification_inbox`
+- `admin_system_messages`
+
 Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
 
+## Extensibility
+
+Extension developers can interact with the Magento_AdminNotification module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdminNotification module.
+
 ### Events
 
 This module observes the following events:
 
- - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver`
+ - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver` file.
 
 ### Layouts
 

app/code/Magento/AdvancedPricingImportExport/README.md

@@ -2,3 +2,8 @@
 
 The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
 
+## Extensibility
+
+Extension developers can interact with the Magento_AdvancedPricingImportExport module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdvancedPricingImportExport module.

app/code/Magento/Amqp/README.md

@@ -1,3 +1,9 @@
-# Amqp
+# Magento_Amqp module
 
-**Amqp** provides functionality to publish/consume messages with Amqp.
+Magento_Amqp module provides functionality to publish/consume messages with the Advanced Message Queuing Protocol (AMQP).
+
+## Extensibility
+
+Extension developers can interact with the Magento_Amqp module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_Amqp module.

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -536,7 +536,7 @@
                     <label>Enable HTTP Strict Transport Security (HSTS)</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-                    <comment><![CDATA[See <a href="https://www.owasp.org/index.php/HTTP_Strict_Transport_Security" target="_blank">HTTP Strict Transport Security</a> page for details.]]></comment>
+                    <comment><![CDATA[See <a href="https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Strict_Transport_Security_Cheat_Sheet.html" target="_blank">HTTP Strict Transport Security</a> page for details.]]></comment>
                     <depends>
                         <field id="use_in_frontend">1</field>
                         <field id="use_in_adminhtml">1</field>

app/code/Magento/Catalog/Model/Category.php

@@ -448,7 +448,9 @@ public function move($parentId, $afterCategoryId)
         if ($this->flatState->isFlatEnabled()) {
             $flatIndexer = $this->indexerRegistry->get(Indexer\Category\Flat\State::INDEXER_ID);
             if (!$flatIndexer->isScheduled()) {
-                $flatIndexer->reindexList([$this->getId(), $oldParentId, $parentId]);
+                $sameLevelCategories = explode(',', $this->getParentCategory()->getChildren());
+                $list = array_unique(array_merge($sameLevelCategories, [$this->getId(), $oldParentId, $parentId]));
+                $flatIndexer->reindexList($list);
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -121,11 +121,15 @@ public function beforeSave($object)
 
         if ($this->fileResidesOutsideCategoryDir($value)) {
             // use relative path for image attribute so we know it's outside of category dir when we fetch it
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $value[0]['url'] = parse_url($value[0]['url'], PHP_URL_PATH);
             $value[0]['name'] = $value[0]['url'];
         }
 
         if ($imageName = $this->getUploadedImageName($value)) {
-            $imageName = $this->checkUniqueImageName($imageName);
+            if (!$this->fileResidesOutsideCategoryDir($value)) {
+                $imageName = $this->checkUniqueImageName($imageName);
+            }
             $object->setData($this->additionalData . $attributeName, $value);
             $object->setData($attributeName, $imageName);
         } elseif (!is_string($value)) {
@@ -182,7 +186,7 @@ private function fileResidesOutsideCategoryDir($value)
             return false;
         }
 
-        return strpos($fileUrl, $baseMediaDir) === 0;
+        return strpos($fileUrl, $baseMediaDir) !== false;
     }
 
     /**

app/code/Magento/Catalog/Model/Category/FileInfo.php

@@ -10,6 +10,8 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class FileInfo
@@ -48,16 +50,26 @@ class FileInfo
      */
     private $pubDirectory;
 
+    /**
+     * Store manager
+     *
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param Filesystem $filesystem
      * @param Mime $mime
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Filesystem $filesystem,
-        Mime $mime
+        Mime $mime,
+        StoreManagerInterface $storeManager
     ) {
         $this->filesystem = $filesystem;
         $this->mime = $mime;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -152,7 +164,8 @@ public function isExist($fileName)
      */
     private function getFilePath($fileName)
     {
-        $filePath = ltrim($fileName, '/');
+        $filePath = $this->removeStorePath($fileName);
+        $filePath = ltrim($filePath, '/');
 
         $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
         $isFileNameBeginsWithMediaDirectoryPath = $this->isBeginsWithMediaDirectoryPath($fileName);
@@ -177,14 +190,39 @@ private function getFilePath($fileName)
      */
     public function isBeginsWithMediaDirectoryPath($fileName)
     {
-        $filePath = ltrim($fileName, '/');
+        $filePath = $this->removeStorePath($fileName);
+        $filePath = ltrim($filePath, '/');
 
         $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
         $isFileNameBeginsWithMediaDirectoryPath = strpos($filePath, (string) $mediaDirectoryRelativeSubpath) === 0;
 
         return $isFileNameBeginsWithMediaDirectoryPath;
     }
 
+    /**
+     * Clean store path in case if it's exists
+     *
+     * @param string $path
+     * @return string
+     */
+    private function removeStorePath(string $path): string
+    {
+        $result = $path;
+        try {
+            $storeUrl = $this->storeManager->getStore()->getBaseUrl();
+        } catch (NoSuchEntityException $e) {
+            return $result;
+        }
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $path = parse_url($path, PHP_URL_PATH);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $storePath = parse_url($storeUrl, PHP_URL_PATH);
+        $storePath = rtrim($storePath, '/');
+
+        $result = preg_replace('/^' . preg_quote($storePath, '/') . '/', '', $path);
+        return $result;
+    }
+
     /**
      * Get media directory subpath relative to base directory path
      *

app/code/Magento/Catalog/Model/Category/Tree.php

@@ -5,7 +5,16 @@
  */
 namespace Magento\Catalog\Model\Category;
 
+use Magento\Catalog\Api\Data\CategoryTreeInterface;
+use Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\TreeFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Tree\Node;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Retrieve category data represented in tree structure
@@ -18,54 +27,54 @@ class Tree
     protected $categoryTree;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
+     * @var Collection
      */
     protected $categoryCollection;
 
     /**
-     * @var \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory
+     * @var CategoryTreeInterfaceFactory
      */
     protected $treeFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
+     * @var TreeFactory
      */
     private $treeResourceFactory;
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
-     * @param \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory|null $treeResourceFactory
+     * @param StoreManagerInterface $storeManager
+     * @param Collection $categoryCollection
+     * @param CategoryTreeInterfaceFactory $treeFactory
+     * @param TreeFactory|null $treeResourceFactory
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection,
-        \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory,
-        \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $treeResourceFactory = null
+        StoreManagerInterface $storeManager,
+        Collection $categoryCollection,
+        CategoryTreeInterfaceFactory $treeFactory,
+        TreeFactory $treeResourceFactory = null
     ) {
         $this->categoryTree = $categoryTree;
         $this->storeManager = $storeManager;
         $this->categoryCollection = $categoryCollection;
         $this->treeFactory = $treeFactory;
-        $this->treeResourceFactory = $treeResourceFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Model\ResourceModel\Category\TreeFactory::class);
+        $this->treeResourceFactory = $treeResourceFactory ?? ObjectManager::getInstance()
+                ->get(TreeFactory::class);
     }
 
     /**
      * Get root node by category.
      *
-     * @param \Magento\Catalog\Model\Category|null $category
+     * @param Category|null $category
      * @return Node|null
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function getRootNode($category = null)
     {
@@ -86,28 +95,28 @@ public function getRootNode($category = null)
     /**
      * Get node by category.
      *
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
      * @return Node
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
-    protected function getNode(\Magento\Catalog\Model\Category $category)
+    protected function getNode(Category $category)
     {
         $nodeId = $category->getId();
         $categoryTree = $this->treeResourceFactory->create();
         $node = $categoryTree->loadNode($nodeId);
         $node->loadChildren();
         $this->prepareCollection();
-        $this->categoryTree->addCollectionData($this->categoryCollection);
+        $categoryTree->addCollectionData($this->categoryCollection);
         return $node;
     }
 
     /**
      * Prepare category collection.
      *
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     protected function prepareCollection()
     {
@@ -128,16 +137,16 @@ protected function prepareCollection()
     /**
      * Get tree by node.
      *
-     * @param \Magento\Framework\Data\Tree\Node $node
+     * @param Node $node
      * @param int $depth
      * @param int $currentLevel
-     * @return \Magento\Catalog\Api\Data\CategoryTreeInterface
+     * @return CategoryTreeInterface
      */
     public function getTree($node, $depth = null, $currentLevel = 0)
     {
-        /** @var \Magento\Catalog\Api\Data\CategoryTreeInterface[] $children */
+        /** @var CategoryTreeInterface[] $children */
         $children = $this->getChildren($node, $depth, $currentLevel);
-        /** @var \Magento\Catalog\Api\Data\CategoryTreeInterface $tree */
+        /** @var CategoryTreeInterface $tree */
         $tree = $this->treeFactory->create();
         $tree->setId($node->getId())
             ->setParentId($node->getParentId())
@@ -153,10 +162,10 @@ public function getTree($node, $depth = null, $currentLevel = 0)
     /**
      * Get node children.
      *
-     * @param \Magento\Framework\Data\Tree\Node $node
+     * @param Node $node
      * @param int $depth
      * @param int $currentLevel
-     * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|[]
+     * @return CategoryTreeInterface[]|[]
      */
     protected function getChildren($node, $depth, $currentLevel)
     {