Merge pull request #3156 from magento-chaika/chaika_sept_23

viktym · web-flow · commit 602ba1580c79 · 2018-09-16T12:09:19.000+03:00
[Chaika] bugfixes 2.3
diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Backend" >
+    <module name="Magento_Backend">
         <sequence>
             <module name="Magento_Directory"/>
         </sequence>
diff --git a/app/code/Magento/Eav/etc/module.xml b/app/code/Magento/Eav/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_Eav" >
         <sequence>
             <module name="Magento_Store"/>
+            <module name="Magento_Theme"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -48,13 +48,6 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $mathRandom;
 
-    /**
-     * Guest customer id
-     *
-     * @var int
-     */
-    private $guestCustomerId = 0;
-
     /**
      * Construct
      *
@@ -75,8 +68,7 @@ public function __construct(
     }
 
     /**
-     * Initialize resource model
-     * Get tablename from config
+     * Initialize resource model. Get tablename from config
      *
      * @return void
      */
@@ -143,24 +135,22 @@ public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface
             return $result;
         }
 
-        if ($customer->getId() === $this->guestCustomerId) {
-            $select = $this->connection
-                ->select()
-                ->from($this->getMainTable())
-                ->where('subscriber_email=:subscriber_email and store_id=:store_id');
-
-            $result = $this->connection
-                ->fetchRow(
-                    $select,
-                    [
-                        'subscriber_email' => $customer->getEmail(),
-                        'store_id' => $customer->getStoreId()
-                    ]
-                );
-
-            if ($result) {
-                return $result;
-            }
+        $select = $this->connection
+            ->select()
+            ->from($this->getMainTable())
+            ->where('subscriber_email=:subscriber_email and store_id=:store_id');
+
+        $result = $this->connection
+            ->fetchRow(
+                $select,
+                [
+                    'subscriber_email' => $customer->getEmail(),
+                    'store_id' => $customer->getStoreId()
+                ]
+            );
+
+        if ($result) {
+            return $result;
         }
 
         return [];
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -9,6 +9,9 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Subscriber model
@@ -127,6 +130,16 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      */
     protected $inlineTranslation;
 
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
     /**
      * Initialize dependencies.
      *
@@ -144,6 +157,8 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param \Magento\Framework\Stdlib\DateTime\DateTime|null $dateTime
+     * @param CustomerInterfaceFactory|null $customerFactory
+     * @param DataObjectHelper|null $dataObjectHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -160,7 +175,9 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null,
+        CustomerInterfaceFactory $customerFactory = null,
+        DataObjectHelper $dataObjectHelper = null
     ) {
         $this->_newsletterData = $newsletterData;
         $this->_scopeConfig = $scopeConfig;
@@ -170,6 +187,10 @@ public function __construct(
         $this->dateTime = $dateTime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
             \Magento\Framework\Stdlib\DateTime\DateTime::class
         );
+        $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()
+            ->get(CustomerInterfaceFactory::class);
+        $this->dataObjectHelper = $dataObjectHelper ?: ObjectManager::getInstance()
+            ->get(DataObjectHelper::class);
         $this->customerRepository = $customerRepository;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->inlineTranslation = $inlineTranslation;
@@ -346,7 +367,17 @@ public function isSubscribed()
      */
     public function loadByEmail($subscriberEmail)
     {
-        $this->addData($this->getResource()->loadByEmail($subscriberEmail));
+        $storeId = $this->_storeManager->getStore()->getId();
+        $customerData = ['store_id' => $storeId, 'email'=> $subscriberEmail];
+
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->addData($this->getResource()->loadByCustomerData($customer));
         return $this;
     }
 
@@ -497,7 +528,7 @@ public function subscribeCustomerById($customerId)
     }
 
     /**
-     * unsubscribe the customer with the id provided
+     * Unsubscribe the customer with the id provided
      *
      * @param int $customerId
      * @return $this
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -62,6 +62,16 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerFactory;
+
     /**
      * @var \Magento\Newsletter\Model\Subscriber
      */
@@ -97,6 +107,14 @@ protected function setUp()
             ]);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
+        $this->customerFactory = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->subscriber = $this->objectManager->getObject(
             \Magento\Newsletter\Model\Subscriber::class,
             [
@@ -108,15 +126,31 @@ protected function setUp()
                 'customerRepository' => $this->customerRepository,
                 'customerAccountManagement' => $this->customerAccountManagement,
                 'inlineTranslation' => $this->inlineTranslation,
-                'resource' => $this->resource
+                'resource' => $this->resource,
+                'customerFactory' => $this->customerFactory,
+                'dataObjectHelper' => $this->dataObjectHelper
             ]
         );
     }
 
     public function testSubscribe()
     {
         $email = 'subscriber_email@magento.com';
-        $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
+        $storeId = 1;
+        $customerData = ['store_id' => $storeId, 'email' => $email];
+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+        $storeModel->expects($this->any())->method('getId')->willReturn($storeId);
+        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->customerFactory->expects($this->once())->method('create')->willReturn($customer);
+        $this->dataObjectHelper->expects($this->once())->method('populateWithArray')->with(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
             [
                 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
@@ -130,7 +164,7 @@ public function testSubscribe()
         $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(1);
         $customerDataModel->expects($this->any())->method('getEmail')->willReturn($email);
         $this->customerRepository->expects($this->any())->method('getById')->willReturn($customerDataModel);
-        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn(1);
+        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn($storeId);
         $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
@@ -141,7 +175,21 @@ public function testSubscribe()
     public function testSubscribeNotLoggedIn()
     {
         $email = 'subscriber_email@magento.com';
-        $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
+        $storeId = 1;
+        $customerData = ['store_id' => $storeId, 'email' => $email];
+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+        $storeModel->expects($this->any())->method('getId')->willReturn($storeId);
+        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->customerFactory->expects($this->once())->method('create')->willReturn($customer);
+        $this->dataObjectHelper->expects($this->once())->method('populateWithArray')->with(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
             [
                 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
@@ -155,7 +203,7 @@ public function testSubscribeNotLoggedIn()
         $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(1);
         $customerDataModel->expects($this->any())->method('getEmail')->willReturn($email);
         $this->customerRepository->expects($this->any())->method('getById')->willReturn($customerDataModel);
-        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn(1);
+        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn($storeId);
         $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -127,8 +127,8 @@ protected function _prepareCollection()
                  * Validate from and to date
                  */
                 try {
-                    $from = $this->_localeDate->scopeDate(null, $this->getFilter('report_from'), false);
-                    $to = $this->_localeDate->scopeDate(null, $this->getFilter('report_to'), false);
+                    $from = $this->_localeDate->date($this->getFilter('report_from'), null, false, false);
+                    $to = $this->_localeDate->date($this->getFilter('report_to'), null, false, false);
 
                     $collection->setInterval($from, $to);
                 } catch (\Exception $e) {
@@ -215,8 +215,8 @@ public function setStoreSwitcherVisibility($visible = true)
 
     /**
      * Return visibility of store switcher
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -227,8 +227,8 @@ public function getStoreSwitcherVisibility()
 
     /**
      * Return store switcher html
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return string
      */
     public function getStoreSwitcherHtml()
@@ -250,8 +250,8 @@ public function setDateFilterVisibility($visible = true)
 
     /**
      * Return visibility of date filter
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -262,8 +262,8 @@ public function getDateFilterVisibility()
 
     /**
      * Return date filter html
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return string
      */
     public function getDateFilterHtml()
@@ -293,8 +293,8 @@ public function getDateFormat()
 
     /**
      * Return refresh button html
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return string
      */
     public function getRefreshButtonHtml()
@@ -346,8 +346,8 @@ public function setSubReportSize($size)
 
     /**
      * Return sub-report rows count
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return int
      */
     public function getSubReportSize()
diff --git a/app/code/Magento/User/etc/module.xml b/app/code/Magento/User/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_User" >
         <sequence>
             <module name="Magento_Backend"/>
+            <module name="Magento_Config"/>
         </sequence>
     </module>
 </config>
diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
@@ -40,6 +40,14 @@
         &:extend(.abs-status all);
     }
 
+    .table-wrapper.table-returns {
+        .returns-details {
+            &.hidden {
+                display: none;
+            }
+        }
+    }
+
     .block-returns-comments {
         .returns-comments {
             dt,
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
@@ -63,14 +63,14 @@ public function testCustomerCreated()
             ->setFirstname('Firstname')
             ->setLastname('Lastname')
             ->setEmail('customer_two@example.com');
-        $this->customerRepository->save(
+        $createdCustomer = $this->customerRepository->save(
             $customerDataObject,
             $this->accountManagement->getPasswordHash('password')
         );
 
         $subscriber->loadByEmail('customer_two@example.com');
         $this->assertTrue($subscriber->isSubscribed());
-        $this->assertEquals(0, (int)$subscriber->getCustomerId());
+        $this->assertEquals((int)$createdCustomer->getId(), (int)$subscriber->getCustomerId());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/ResourceModel/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/ResourceModel/SubscriberTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
