[Magento Community Engineering] Community Contributions - 2.3-develop-prs

 - merged with '2.3-develop-expedited-prs' branch

Author: magento-engcom-team

app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml

@@ -28,12 +28,13 @@ require(['prototype'], function(){
                         result = response.message;
                     }
                     if (response.valid == 1) {
-                        validationMessage.removeClassName('hidden').addClassName('success')
+                        validationMessage.removeClassName('hidden').removeClassName('admin__field-error').addClassName('note');
+                        validationMessage.setStyle({color:'green'});
                     } else {
-                        validationMessage.removeClassName('hidden').addClassName('error')
+                        validationMessage.removeClassName('hidden').addClassName('admin__field-error');
                     }
                 } catch (e) {
-                    validationMessage.removeClassName('hidden').addClassName('error')
+                    validationMessage.removeClassName('hidden').addClassName('admin__field-error');
                 }
                 validationMessage.update(result);
             }
@@ -46,8 +47,9 @@ require(['prototype'], function(){
 });
 </script>
 <div class="actions actions-validate-vat">
-    <div id="validation_result" class="message-validation hidden"></div>
+    <p class="admin__field-error hidden" id="validation_result" style="margin-bottom:10px;"></p>
     <button onclick="javascript:validateVat(); return false;" class="action-validate-vat" type="button" id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>">
         <span><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
     </button>
 </div>
+

app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\EncryptionKey\Block\Adminhtml\Crypt\Key;
 
 /**
@@ -53,7 +55,14 @@ protected function _prepareForm()
         $fieldset->addField(
             'crypt_key',
             'text',
-            ['name' => 'crypt_key', 'label' => __('New Key'), 'style' => 'width:32em;', 'maxlength' => 32]
+            [
+                'name' => 'crypt_key',
+                'label' => __('New Key'),
+                'style' => 'width:32em;',
+                'maxlength' => 32,
+                'required' => true,
+                'class' => 'required-entry'
+            ]
         );
         $form->setUseContainer(true);
         if ($data = $this->getFormData()) {

app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php

@@ -341,10 +341,14 @@ public function deleteFolder($folderName = '')
             return;
         }
 
-        $likeExpression = $this->_resourceHelper->addLikeEscape($folderName . '/', ['position' => 'start']);
         $this->getConnection()->delete(
             $this->getMainTable(),
-            new \Zend_Db_Expr('filename LIKE ' . $likeExpression)
+            new \Zend_Db_Expr(
+                'directory LIKE ' .
+                $this->_resourceHelper->addLikeEscape($folderName . '/', ['position' => 'start'])
+                . ' ' . \Magento\Framework\DB\Select::SQL_OR . ' ' .
+                $this->getConnection()->prepareSqlCondition('directory', ['seq' => $folderName])
+            )
         );
     }
 

app/code/Magento/SendFriend/Model/SendFriend.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\SendFriend\Model;
 
 use Magento\Framework\Exception\LocalizedException as CoreException;
@@ -193,8 +195,11 @@ public function send()
                     'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
                     'store' => $this->_storeManager->getStore()->getId(),
                 ]
-            )->setFrom(
-                $sender
+            )->setFromByScope(
+                'general'
+            )->setReplyTo(
+                $sender['email'],
+                $sender['name']
             )->setTemplateVars(
                 [
                     'name' => $name,

dev/tests/integration/testsuite/Magento/MediaStorage/Helper/File/Storage/DatabaseTest.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaStorage\Helper\File\Storage;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Integration tests for Magento\MediaStorage\Helper\File\Storage\Database
+ */
+class DatabaseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Database
+     */
+    private $databaseHelper;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+    }
+
+    /**
+     * test for \Magento\MediaStorage\Model\File\Storage\Database::deleteFolder()
+     *
+     * @magentoDataFixture Magento/MediaStorage/_files/database_mode.php
+     */
+    public function testDeleteFolder()
+    {
+        $this->databaseHelper = $this->objectManager->get(
+            Database::class
+        );
+
+        $filenames = [
+            'test1/test2/test3/test4.dat',
+            'test1/test2/test3/test4a.dat',
+            'test5/test6/test7.dat',
+            'test5/test6a/test7a.dat',
+            'test8/test9.dat'
+        ];
+
+        foreach ($filenames as $filename) {
+            $this->mediaDirectory->writeFile($filename, '');
+            $this->databaseHelper->saveFile($filename);
+            $this->assertEquals(true, $this->databaseHelper->fileExists($filename));
+        }
+
+        $this->databaseHelper->deleteFolder('test1/test2/test3');
+        $this->databaseHelper->deleteFolder('test5');
+        $this->databaseHelper->deleteFolder('test8');
+
+        foreach ($filenames as $filename) {
+            $this->assertEquals(false, $this->databaseHelper->fileExists($filename));
+            $this->mediaDirectory->delete($filename);
+        }
+    }
+}

dev/tests/integration/testsuite/Magento/MediaStorage/_files/database_mode.php

@@ -5,11 +5,11 @@
  */
 declare(strict_types=1);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
 /** @var $database \Magento\MediaStorage\Helper\File\Storage\Database */
 $database = $objectManager->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-
 $database->getStorageDatabaseModel()->init();
 
 $config = $objectManager->get(Magento\Framework\App\Config\ConfigResource\ConfigInterface::class);