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>

app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CustomerTest.php

@@ -29,7 +29,7 @@ class CustomerTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->addressFactoryMock = $this->createMock(AddressFactory::class);
         $objectManager = new ObjectManager($this);

app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php

@@ -324,7 +324,7 @@ public function testSaveTemporaryFileWithError()
     public function testMoveTemporaryFileUnableToCreateDirectory()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('Unable to create directory customer/f/i');
+        $this->expectExceptionMessage('Unable to create directory /f/i');
 
         $filePath = '/filename.ext1';
 

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php

@@ -76,27 +76,27 @@ class ImageTest extends AbstractFormTestCase
     private $fileProcessorFactoryMock;
 
     /**
-     * @var File|PHPUnit_Framework_MockObject_MockObject
+     * @var File|\PHPUnit\Framework\MockObject\MockObject
      */
     private $ioFileSystemMock;
 
     /**
-     * @var DirectoryList|PHPUnit_Framework_MockObject_MockObject
+     * @var DirectoryList|\PHPUnit\Framework\MockObject\MockObject
      */
     private $directoryListMock;
 
     /**
-     * @var WriteFactory|PHPUnit_Framework_MockObject_MockObject
+     * @var WriteFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $writeFactoryMock;
 
     /**
-     * @var Write|PHPUnit_Framework_MockObject_MockObject
+     * @var Write|\PHPUnit\Framework\MockObject\MockObject
      */
     private $mediaEntityTmpDirectoryMock;
 
     /**
-     * @var Driver|PHPUnit_Framework_MockObject_MockObject
+     * @var Driver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $driverMock;
 
@@ -251,6 +251,14 @@ public function testValidate()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -304,6 +312,14 @@ public function testValidateMaxFileSize()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -356,6 +372,14 @@ public function testValidateMaxImageWidth()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -408,6 +432,14 @@ public function testValidateMaxImageHeight()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,

app/code/Magento/Customer/Test/Unit/Model/Webapi/ParamOverriderCustomerGroupIdTest.php

@@ -38,7 +38,7 @@ class ParamOverriderCustomerGroupIdTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->userContextMock = $this->createMock(UserContextInterface::class);
         $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);

app/code/Magento/Customer/Test/Unit/Model/Webapi/ParamOverriderCustomerStoreIdTest.php

@@ -38,7 +38,7 @@ class ParamOverriderCustomerStoreIdTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->userContextMock = $this->createMock(UserContextInterface::class);
         $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);

app/code/Magento/Customer/Test/Unit/Model/Webapi/ParamOverriderCustomerWebsiteIdTest.php

@@ -38,7 +38,7 @@ class ParamOverriderCustomerWebsiteIdTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->userContextMock = $this->createMock(UserContextInterface::class);
         $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);

app/code/Magento/Sales/Api/Data/OrderInterface.php

@@ -913,7 +913,10 @@ public function setCreatedAt($createdAt);
     /**
      * Gets the customer date-of-birth (DOB) for the order.
      *
-     * @return string|null Customer date-of-birth (DOB).
+     * @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 getCustomerDob();
 

app/code/Magento/SampleData/README.md

@@ -51,7 +51,7 @@ To deploy sample data from the GitHub repository:
 
 ## Install Sample Data
 
-Once the sample data is deployed, it will be installed automatically when you install or upgrade your Magento instance either by using the Magento Setup Wizard or from the command line.
+Once the sample data is deployed, it will be installed automatically when you install or upgrade your Magento instance by using the command line.
 
 ## Uninstall Sample Data
 

app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php

@@ -8,6 +8,7 @@
 
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Io\File as IoFile;
 use Magento\Theme\Model\Design\Backend\Image;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
@@ -32,7 +33,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->ioFileSystem = $this->getMockObject(IoFile::class);
         $this->tmpDirectory = $this->getMockObject(ReadFactory::class);
@@ -46,7 +47,7 @@ public function setUp()
     /**
      * @inheritdoc
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->imageBackend);
     }
@@ -68,12 +69,12 @@ protected function getMockObject($class, $methods = [])
 
     /**
      * Test for beforeSave method with invalid file extension.
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid file provided.
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('Invalid file provided.');
+
         $invalidFileName = 'fileName.invalidExtension';
         $this->imageBackend->setData(
             [