Merge branch '2.4-develop' into fix_type_casting

magento · Sep 22, 2020 · b8dd6b3 · b8dd6b3
2 parents 0118d48 + 390505a
commit b8dd6b3
Show file tree

Hide file tree

Showing 5,582 changed files with 160,143 additions and 26,522 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -23,7 +23,7 @@ For more detailed information on contribution please read our [beginners guide](
 * Unit/integration test coverage
 * Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
 4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
-5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
+5. All automated tests must pass.
 
 ## Contribution process
 

diff --git a/.github/ISSUE_TEMPLATE/story.md b/.github/ISSUE_TEMPLATE/story.md
@@ -0,0 +1,14 @@
+---
+name: GraphQL Story
+about: User story for GraphQL project
+labels: 'Project: GraphQL'
+
+---
+
+*As a ___ I want to ___ so that ___.*
+
+### AC
+* a
+* b
+### Approved Schema
+* a
diff --git a/.htaccess b/.htaccess
@@ -238,15 +238,6 @@
             Require all denied
         </IfVersion>
     </Files>
-    <Files .travis.yml>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
     <Files CHANGELOG.md>
         <IfVersion < 2.4>
             order allow,deny

diff --git a/.htaccess.sample b/.htaccess.sample
@@ -238,15 +238,6 @@
             Require all denied
         </IfVersion>
     </Files>
-    <Files .travis.yml>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
     <Files CHANGELOG.md>
         <IfVersion < 2.4>
             order allow,deny

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 <p align="center">
-  <a href="https://magento.com">
-    <img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento" />
-  </a>
-</p>
-<p align="center">
-    <br /><br />
+    <a href="https://magento.com">
+        <img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento Commerce" />
+    </a>
+    <br />
+    <br />
     <a href="https://www.codetriage.com/magento/magento2">
         <img src="https://www.codetriage.com/magento/magento2/badges/users.svg" alt="Open Source Helpers" />
     </a>

diff --git a/app/autoload.php b/app/autoload.php
@@ -5,36 +5,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Framework\Autoload\AutoloaderRegistry;
 use Magento\Framework\Autoload\ClassLoaderWrapper;
 
 /**
  * Shortcut constant for the root directory
  */
-define('BP', dirname(__DIR__));
+\define('BP', \dirname(__DIR__));
 
-define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
+\define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
 
-if (!file_exists(VENDOR_PATH)) {
+if (!\is_readable(VENDOR_PATH)) {
     throw new \Exception(
         'We can\'t read some files that are required to run the Magento application. '
          . 'This usually means file permissions are set incorrectly.'
     );
 }
 
-$vendorDir = require VENDOR_PATH;
-$vendorAutoload = BP . "/{$vendorDir}/autoload.php";
+$vendorAutoload = (
+    static function (): ?string {
+        $vendorDir = require VENDOR_PATH;
+
+        $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
+        if (\is_readable($vendorAutoload)) {
+            return $vendorAutoload;
+        }
+
+        $vendorAutoload = "{$vendorDir}/autoload.php";
+        if (\is_readable($vendorAutoload)) {
+            return $vendorAutoload;
+        }
+
+        return null;
+    }
+)();
 
-/* 'composer install' validation */
-if (file_exists($vendorAutoload)) {
-    $composerAutoloader = include $vendorAutoload;
-} else if (file_exists("{$vendorDir}/autoload.php")) {
-	$vendorAutoload = "{$vendorDir}/autoload.php";
-	$composerAutoloader = include $vendorAutoload;
-} else {
+if ($vendorAutoload === null) {
     throw new \Exception(
         'Vendor autoload is not found. Please run \'composer install\' under application root directory.'
     );
 }
 
+$composerAutoloader = include $vendorAutoload;
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -14,15 +14,15 @@
 #ini_set('display_errors', 1);
 
 /* PHP version validation */
-if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) {
+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70300) {
     if (PHP_SAPI == 'cli') {
-        echo 'Magento supports PHP 7.1.3 or later. ' .
-            'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html';
+        echo 'Magento supports PHP 7.3.0 or later. ' .
+            'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <p>Magento supports PHP 7.1.3 or later. Please read
-    <a target="_blank" href="https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html">
+    <p>Magento supports PHP 7.3.0 or later. Please read
+    <a target="_blank" href="https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html">
     Magento System Requirements</a>.
 </div>
 HTML;

diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckAnalyticsTrackingTest">
+        <annotations>
+            <stories value="AdminAnalytics Check Tracking."/>
+            <title value="AdminAnalytics Check Tracking."/>
+            <description value="AdminAnalytics Check Tracking."/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-36869"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+            <magentoCLI command="config:set admin/usage/enabled 1" stepKey="enableAdminUsageTracking"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
+            <reloadPage stepKey="pageReload"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set admin/usage/enabled 0" stepKey="disableAdminUsageTracking"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <waitForPageLoad stepKey="waitForPageReloaded"/>
+        <seeInPageSource html="var adminAnalyticsMetadata =" stepKey="seeInPageSource"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/TrackingScriptTest.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/TrackingScriptTest.xml
diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="script-src">
+                <values>
+                    <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                </values>
+            </policy>
+            <policy id="img-src">
+                <values>
+                    <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                    <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                    <value id="everesttech" type="host">cm.everesttech.net</value>
+                </values>
+            </policy>
+            <policy id="connect-src">
+                <values>
+                    <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                    <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                </values>
+            </policy>
+            <policy id="frame-src">
+                <values>
+                    <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
@@ -4,13 +4,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<script>
+<?php
+$isAnaliticsVisible = $block->getNotification()->isAnalyticsVisible() ? 1 : 0;
+$isReleaseVisible = $block->getNotification()->isReleaseVisible() ? 1 : 0;
+$scriptString = <<<script
     define('analyticsPopupConfig', function () {
         return {
-            analyticsVisible: <?= $block->getNotification()->isAnalyticsVisible() ? 1 : 0; ?>,
-            releaseVisible: <?= $block->getNotification()->isReleaseVisible() ? 1 : 0; ?>,
+            analyticsVisible: {$isAnaliticsVisible},
+            releaseVisible: {$isReleaseVisible},
         }
     });
-</script>
+script;
+?>
+
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -3,13 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
-<script src="<?= $block->escapeUrl($block->getTrackingUrl()) ?>" async></script>
-<script>
+<?= /* @noEscape */ $secureRenderer->renderTag(
+    'script',
+    [
+        'src' => $block->getTrackingUrl(),
+        'async' => true,
+    ],
+    '&nbsp;',
+    false
+) ?>
+
+<?php $scriptString = '
     var adminAnalyticsMetadata = {
-        "version": "<?= $block->escapeJs($block->getMetadata()->getMagentoVersion()) ?>",
-        "user": "<?= $block->escapeJs($block->getMetadata()->getCurrentUser()) ?>",
-        "mode": "<?= $block->escapeJs($block->getMetadata()->getMode()) ?>"
+        "version": "' . $block->escapeJs($block->getMetadata()->getMagentoVersion()) . '",
+        "user": "' . $block->escapeJs($block->getMetadata()->getCurrentUser()) . '",
+        "mode": "' . $block->escapeJs($block->getMetadata()->getMode()) . '"
     };
-</script>
+';
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/app/code/Magento/AdminNotification/Block/System/Messages.php
@@ -26,7 +26,7 @@ class Messages extends Template
 
     /**
      * @var JsonDataHelper
-     * @deprecated
+     * @deprecated 100.3.0
      */
     protected $jsonHelper;
 

diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -17,7 +17,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @deprecated
+     * @deprecated 100.3.0
      */
     protected $jsonHelper;
 

diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.xml b/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNotificationToolbarSection">
+        <element name="notification" type="block" selector=".notifications-wrapper.admin__action-dropdown-wrap"/>
+        <element name="notificationCounter" type="block" selector=".notifications-action.admin__action-dropdown .notifications-counter"/>
+    </section>
+</sections>