Merge branch '2.3-develop' of github.com:magento/graphql-ce into 685-CustomerDownloadableGraphQl

Author: lenaorobei

.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](http://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+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
 
@@ -21,10 +31,10 @@ This module introduces the following layouts and layout handles in the `view/adm
 - `adminhtml_notification_index`
 - `adminhtml_notification_block`
 
-For more information about layouts in Magento 2, see the [Layout documentation](http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
 
 ### UI components
 
 You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
 
-For information about UI components in Magento 2, see [Overview of UI components](http://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
+For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).

app/code/Magento/AdvancedPricingImportExport/README.md

@@ -1 +1,9 @@
-The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+# Magento_AdvancedPricingImportExport module
+
+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/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -23,7 +23,7 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
     <?php if ($block->canDisplayContainer()) : ?>
 <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
     <?php else : ?>
-    <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+        <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">

app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Bundle\Model\ResourceModel\Option;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+
 /**
  * Bundle Options Resource Collection
  * @api
@@ -138,12 +140,10 @@ public function setPositionOrder()
 
     /**
      * Append selection to options
-     * stripBefore - indicates to reload
-     * appendAll - indicates do we need to filter by saleable and required custom options
      *
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionsCollection
-     * @param bool $stripBefore
-     * @param bool $appendAll
+     * @param bool $stripBefore indicates to reload
+     * @param bool $appendAll indicates do we need to filter by saleable and required custom options
      * @return \Magento\Framework\DataObject[]
      */
     public function appendSelections($selectionsCollection, $stripBefore = false, $appendAll = true)
@@ -156,7 +156,9 @@ public function appendSelections($selectionsCollection, $stripBefore = false, $a
             foreach ($selectionsCollection->getItems() as $key => $selection) {
                 $option = $this->getItemById($selection->getOptionId());
                 if ($option) {
-                    if ($appendAll || $selection->isSalable() && !$selection->getRequiredOptions()) {
+                    if ($appendAll ||
+                        ((int) $selection->getStatus()) === Status::STATUS_ENABLED && !$selection->getRequiredOptions()
+                    ) {
                         $selection->setOption($option);
                         $option->addSelection($selection);
                     } else {

app/code/Magento/Catalog/Block/Product/ImageFactory.php

@@ -160,6 +160,8 @@ public function create(Product $product, string $imageId, array $attributes = nu
             );
         }
 
+        $attributes = $attributes === null ? [] : $attributes;
+        
         $data = [
             'data' => [
                 'template' => 'Magento_Catalog::product/image_with_borders.phtml',

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
      *