Merge pull request #6691 from magento-cia/2.3.7-develop-2.3-develop-sync-030921

Sync of 2.3.7-develop with 2.3-develop

Author: dvoskoboinikov

.php_cs.dist

@@ -10,9 +10,6 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
-    ->exclude('dev/tests/functional/generated')
-    ->exclude('dev/tests/functional/var')
-    ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
     ->exclude('lib/internal/Cm')

app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

@@ -149,7 +149,6 @@
             <item>Magento_Backend::custom</item>
             <item>Magento_Backend::tools</item>
             <item>Magento_Backend::cache</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Backup::rollback</item>
             <item>Magento_Indexer::index</item>

app/code/Magento/Backend/etc/acl.xml

@@ -53,7 +53,6 @@
                                 <resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
                             </resource>
                         </resource>
-                        <resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard (Deprecated)" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title"  sortOrder="80" />
                 </resource>

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

@@ -27,6 +27,5 @@
         <add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
         <add id="Magento_Backend::other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
         <add id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
-        <add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard (Deprecated)" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
     </menu>
 </config>

app/code/Magento/Backend/i18n/en_US.csv

@@ -312,7 +312,6 @@ Attributes,Attributes
 "Connect Manager","Connect Manager"
 "Package Extensions","Package Extensions"
 Tools,Tools
-"Web Setup Wizard (Deprecated)","Web Setup Wizard (Deprecated)"
 Currency,Currency
 Communications,Communications
 Services,Services

app/code/Magento/Captcha/Test/Unit/Model/Filter/QuoteDataConfigFilterTest.php

@@ -30,7 +30,7 @@ class QuoteDataConfigFilterTest extends TestCase
     /**
      * Initialize Class Dependencies
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
 

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Cms\Model\Wysiwyg\Images\Storage\Collection as StorageCollection;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\DataObject;
 
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
@@ -166,11 +167,9 @@ protected function setUp(): void
         )->method(
             'getPathInfo'
         )->willReturnCallback(
-
-                function ($path) {
-                    return pathinfo($path);
-                }
-
+            function ($path) {
+                 return pathinfo($path);
+            }
         );
 
         $this->adapterFactoryMock = $this->createMock(\Magento\Framework\Image\AdapterFactory::class);
@@ -359,7 +358,10 @@ public function testGetDirsCollection($exclude, $include, $fileNames, $expectedR
         $collection = [];
         foreach ($fileNames as $filename) {
             /** @var \Magento\Framework\DataObject|\PHPUnit\Framework\MockObject\MockObject $objectMock */
-            $objectMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getFilename']);
+            $objectMock = $this->getMockBuilder(DataObject::class)
+                ->addMethods(['getFilename'])
+                ->disableOriginalConstructor()
+                ->getMock();
             $objectMock->expects($this->any())
                 ->method('getFilename')
                 ->willReturn(self::STORAGE_ROOT_DIR . $filename);
@@ -539,10 +541,14 @@ public function testUploadFile()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     *
      */
     public function testUploadFileWithExcessivePath()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+
         $path = 'target/path';
         $targetPath = self::STORAGE_ROOT_DIR .str_repeat('a', 255) . $path;
         $type = 'image';

app/code/Magento/Cron/etc/di.xml

@@ -68,14 +68,6 @@
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
                     <item name="optional" xsi:type="boolean">false</item>
                 </item>
-                <item name="cronUpdate" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}update/cron.php >> {magentoLog}update.cron.log</item>
-                    <item name="optional" xsi:type="boolean">true</item>
-                </item>
-                <item name="cronSetup" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}bin/magento setup:cron:run >> {magentoLog}setup.cron.log</item>
-                    <item name="optional" xsi:type="boolean">true</item>
-                </item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Customer/Api/Data/CustomerInterface.php

@@ -6,7 +6,8 @@
 namespace Magento\Customer\Api\Data;
 
 /**
- * Customer interface.
+ * Customer entity interface for API handling.
+ *
  * @api
  * @since 100.0.2
  */
@@ -161,7 +162,10 @@ public function setCreatedIn($createdIn);
     /**
      * Get date of birth
      *
-     * @return string|null
+     * @return string|null In keeping with current security and privacy best practices, be sure you are aware of any
+     * potential legal and security risks associated with the storage of customers’ full date of birth
+     * (month, day, year) along with other personal identifiers (e.g., full name) before collecting or processing
+     * such data.
      */
     public function getDob();
 

app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml

@@ -11,7 +11,7 @@
     <section name="AdminDeleteUserSection">
         <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
         <element name="password" selector="#user_current_password" type="input"/>
-        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
+        <element name="delete" selector=".page-actions-buttons #delete" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
     </section>
 </sections>