Merge branch '2.4-develop' into fix-eav-cache-type

magento · Nov 12, 2024 · acdbedd · acdbedd
2 parents 9e0e6c0 + 651928c
commit acdbedd
Show file tree

Hide file tree

Showing 21 changed files with 270 additions and 225 deletions.
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
@@ -73,7 +73,6 @@
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
-    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="Magento\Catalog\Model\MassAction" />
     <preference for="Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface" type="Magento\Catalog\Model\ProductLink\Data\ListCriteria" />
     <preference for="Magento\Catalog\Api\CategoryListDeleteBySkuInterface" type="Magento\Catalog\Model\CategoryLinkRepository"/>
     <preference for="Magento\Theme\CustomerData\MessagesProviderInterface" type="Magento\Catalog\Model\Theme\CustomerData\MessagesProvider"/>

diff --git a/app/code/Magento/Directory/Model/AllowedCountries.php b/app/code/Magento/Directory/Model/AllowedCountries.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Directory\Model;
@@ -18,7 +18,7 @@
  */
 class AllowedCountries
 {
-    const ALLOWED_COUNTRIES_PATH = 'general/country/allow';
+    public const ALLOWED_COUNTRIES_PATH = 'general/country/allow';
 
     /**
      * @var ScopeConfigInterface
@@ -47,7 +47,7 @@ public function __construct(
      * Retrieve all allowed countries for scope or scopes
      *
      * @param string $scope
-     * @param string|null $scopeCode
+     * @param string|null|array $scopeCode
      * @return array
      * @since 100.1.2
      */

diff --git a/app/code/Magento/GoogleGtag/etc/csp_whitelist.xml b/app/code/Magento/GoogleGtag/etc/csp_whitelist.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 -->
 <csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19,9 +19,9 @@
         </policy>
         <policy id="connect-src">
             <values>
-            <value id="google_ad_services" type="host">www.googleadservices.com</value>
-                <value id="google_analytics" type="host">www.google-analytics.com</value>
-                <value id="google_analytics_4" type="host">analytics.google.com</value>
+                <value id="google_ad_services" type="host">www.googleadservices.com</value>
+                <value id="google_analytics" type="host">*.google-analytics.com</value>
+                <value id="google_analytics_4" type="host">*.analytics.google.com</value>
                 <value id="google_tag_manager" type="host">www.googletagmanager.com</value>
             </values>
         </policy>
@@ -32,12 +32,12 @@
         </policy>
         <policy id="img-src">
             <values>
-               <value id="google_ad_services_pixel" type="host">googleads.g.doubleclick.net</value>
-               <value id="google_ad_services_conversion" type="host">www.google.com</value>
-               <value id="google_ad_services_bid" type="host">bid.g.doubleclick.net</value>
+                <value id="google_ad_services_pixel" type="host">googleads.g.doubleclick.net</value>
+                <value id="google_ad_services_conversion" type="host">www.google.com</value>
+                <value id="google_ad_services_bid" type="host">bid.g.doubleclick.net</value>
                 <value id="google_ad_services" type="host">www.googleadservices.com</value>
-                <value id="google_analytics" type="host">www.google-analytics.com</value>
-                <value id="google_analytics_4" type="host">analytics.google.com</value>
+                <value id="google_analytics" type="host">*.google-analytics.com</value>
+                <value id="google_analytics_4" type="host">*.analytics.google.com</value>
                 <value id="google_tag_manager" type="host">www.googletagmanager.com</value>
             </values>
         </policy>

diff --git a/app/code/Magento/RemoteStorage/etc/di.xml b/app/code/Magento/RemoteStorage/etc/di.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\RemoteStorage\Driver\Adapter\Cache\CacheInterface" type="Magento\RemoteStorage\Driver\Adapter\Cache\Generic"/>
     <preference for="Magento\RemoteStorage\Driver\Adapter\CachedAdapterInterface" type="Magento\RemoteStorage\Driver\Adapter\CachedAdapter"/>
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProvider"/>
-    <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactoryInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactory"/>
     <preference for="Magento\Framework\Filesystem\DriverPool" type="Magento\RemoteStorage\Driver\DriverPool"/>
     <preference for="Magento\Framework\File\Uploader" type="Magento\RemoteStorage\Model\File\Uploader"/>
     <virtualType name="remoteWriteFactory" type="Magento\Framework\Filesystem\Directory\WriteFactory">

diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -82,7 +82,6 @@
     <preference for="Magento\Framework\Json\DecoderInterface" type="Magento\Framework\Json\Decoder" />
     <preference for="Magento\Framework\Message\ManagerInterface" type="Magento\Framework\Message\Manager" />
     <preference for="Magento\Framework\App\Config\ValueInterface" type="Magento\Framework\App\Config\Value" />
-    <preference for="Magento\Framework\Interception\ChainInterface" type="Magento\Framework\Interception\Chain\Chain" />
     <preference for="Magento\Framework\Module\Output\ConfigInterface" type="Magento\Framework\Module\Output\Config" />
     <preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
     <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -1,13 +1,13 @@
 <?php
 /**
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
+ *
  * Obsolete classes
  *
  * Format: array(<class_name>[, <replacement>])
  *
  * @codingStandardsIgnoreFile
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
  */
 return [
     ['Mage_Admin_Helper_Data', 'Magento\Backend\Helper\Data'],
@@ -2845,7 +2845,7 @@
     ['Magento\Framework\Stdlib\CookieManager', 'Magento\Framework\Stdlib\CookieManagerInterface'],
     ['Magento\Framework\Interception\PluginList', 'Magento\Framework\Interception\PluginListInterface'],
     ['Magento\Framework\Interception\Config', 'Magento\Framework\Interception\ConfigInterface'],
-    ['Magento\Framework\Interception\Chain', 'Magento\Framework\Interception\ChainInterface'],
+    ['Magento\Framework\Interception\Chain'],
     ['Magento\Framework\Interception\Definition', 'Magento\Framework\Interception\DefinitionInterface'],
     ['Magento\Framework\ObjectManager\Factory', 'Magento\Framework\ObjectManager\FactoryInterface'],
     ['Magento\Framework\ObjectManager\Config', 'Magento\Framework\ObjectManager\ConfigInterface'],

diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php
@@ -1,10 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter\Less;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State;
 use Magento\Framework\Css\PreProcessor\File\Temporary;
 use Magento\Framework\Phrase;
@@ -16,6 +18,8 @@
 
 /**
  * Class Processor
+ *
+ * Process LESS files into CSS
  */
 class Processor implements ContentProcessorInterface
 {
@@ -39,24 +43,32 @@ class Processor implements ContentProcessorInterface
      */
     private $temporaryFile;
 
+    /**
+     * @var DirectoryList
+     */
+    private DirectoryList $directoryList;
+
     /**
      * Constructor
      *
      * @param LoggerInterface $logger
      * @param State $appState
      * @param Source $assetSource
      * @param Temporary $temporaryFile
+     * @param ?DirectoryList $directoryList
      */
     public function __construct(
         LoggerInterface $logger,
         State $appState,
         Source $assetSource,
-        Temporary $temporaryFile
+        Temporary $temporaryFile,
+        ?DirectoryList $directoryList = null,
     ) {
         $this->logger = $logger;
         $this->appState = $appState;
         $this->assetSource = $assetSource;
         $this->temporaryFile = $temporaryFile;
+        $this->directoryList = $directoryList ?: ObjectManager::getInstance()->get(DirectoryList::class);
     }
 
     /**
@@ -66,10 +78,19 @@ public function processContent(File $asset)
     {
         $path = $asset->getPath();
         try {
+            $mode = $this->appState->getMode();
+            $sourceMapBasePath = sprintf(
+                '%s/pub/',
+                $this->directoryList->getPath(DirectoryList::TEMPLATE_MINIFICATION_DIR),
+            );
+
             $parser = new \Less_Parser(
                 [
                     'relativeUrls' => false,
-                    'compress' => $this->appState->getMode() !== State::MODE_DEVELOPER
+                    'compress' => $mode !== State::MODE_DEVELOPER,
+                    'sourceMap' => $mode === State::MODE_DEVELOPER,
+                    'sourceMapRootpath' => '/',
+                    'sourceMapBasepath' => $sourceMapBasePath,
                 ]
             );