🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit cfba0e13e35d · 2018-10-30T18:40:13.000+02:00
Accepted Public Pull Requests: - #18874: [Backport] Fixed issue #4468 "Unable to insert multiple catalog product list wid� (by @gelanivishal) - #18287: Ensure integer values are not quoted as strings (by @udovicic) - #17978: #17488 Fix Authenticating a customer via REST API does not update the last logged in data (by @prakashpatel07) Fixed GitHub Issues: - #4468: Unable to insert multiple catalog product list widgets in CMS page (reported by @kandrejevs) has been fixed in #18874 by @gelanivishal in 2.2-develop branch Related commits: 1. 3f17772 - #17488: Authenticating a customer via REST API does not update the last logged in data (reported by @paul-blundell) has been fixed in #17978 by @prakashpatel07 in 2.2-develop branch Related commits: 1. d73e84f 2. 9a4f260 3. 55047c7 4. da2c920 5. e8636ef 6. 141b0e4
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php
@@ -102,7 +102,7 @@ private function getCategoryIds(Filter $filter): array
             }
         }
 
-        return array_unique(array_merge($categoryIds, ...$childCategoryIds));
+        return array_map('intval', array_unique(array_merge($categoryIds, ...$childCategoryIds)));
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ProductCategoryList.php b/app/code/Magento/Catalog/Model/ProductCategoryList.php
@@ -81,7 +81,10 @@ public function getCategoryIds($productId)
                 Select::SQL_UNION_ALL
             );
 
-            $this->categoryIdList[$productId] = $this->productResource->getConnection()->fetchCol($unionSelect);
+            $this->categoryIdList[$productId] = array_map(
+                'intval',
+                $this->productResource->getConnection()->fetchCol($unionSelect)
+            );
         }
 
         return $this->categoryIdList[$productId];
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1803,7 +1803,8 @@ protected function _productLimitationJoinWebsite()
             }
             $conditions[] = $this->getConnection()->quoteInto(
                 'product_website.website_id IN(?)',
-                $filters['website_ids']
+                $filters['website_ids'],
+                'int'
             );
         } elseif (isset(
             $filters['store_id']
@@ -1815,7 +1816,7 @@ protected function _productLimitationJoinWebsite()
         ) {
             $joinWebsite = true;
             $websiteId = $this->_storeManager->getStore($filters['store_id'])->getWebsiteId();
-            $conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId);
+            $conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId, 'int');
         }
 
         $fromPart = $this->getSelect()->getPart(\Magento\Framework\DB\Select::FROM);
@@ -2011,12 +2012,12 @@ protected function _applyProductLimitations()
 
         $conditions = [
             'cat_index.product_id=e.entity_id',
-            $this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id']),
+            $this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id'], 'int'),
         ];
         if (isset($filters['visibility']) && !isset($filters['store_table'])) {
-            $conditions[] = $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility']);
+            $conditions[] = $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility'], 'int');
         }
-        $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id']);
+        $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id'], 'int');
         if (isset($filters['category_is_anchor'])) {
             $conditions[] = $this->getConnection()->quoteInto('cat_index.is_parent=?', $filters['category_is_anchor']);
         }
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -196,7 +196,7 @@ public function getProductPriceHtml(
             ? $arguments['display_minimal_price']
             : true;
 
-            /** @var \Magento\Framework\Pricing\Render $priceRender */
+        /** @var \Magento\Framework\Pricing\Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
 
         $price = '';
@@ -338,7 +338,7 @@ public function getPagerHtml()
             if (!$this->pager) {
                 $this->pager = $this->getLayout()->createBlock(
                     \Magento\Catalog\Block\Product\Widget\Html\Pager::class,
-                    'widget.products.list.pager'
+                    $this->getWidgetPagerBlockName()
                 );
 
                 $this->pager->setUseContainer(true)
@@ -398,4 +398,19 @@ private function getPriceCurrency()
         }
         return $this->priceCurrency;
     }
+
+    /**
+     * @return string
+     */
+    private function getWidgetPagerBlockName()
+    {
+        $pageName = $this->getData('page_var_name');
+        $pagerBlockName = 'widget.products.list.pager';
+
+        if (!$pageName) {
+            return $pagerBlockName;
+        }
+
+        return $pagerBlockName . '.' . $pageName;
+    }
 }
diff --git a/app/code/Magento/Integration/Model/CustomerTokenService.php b/app/code/Magento/Integration/Model/CustomerTokenService.php
@@ -14,6 +14,7 @@
 use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory as TokenCollectionFactory;
 use Magento\Integration\Model\Oauth\Token\RequestThrottler;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Event\ManagerInterface;
 
 class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServiceInterface
 {
@@ -48,24 +49,33 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      */
     private $requestThrottler;
 
+    /**
+     * @var Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * Initialize service
      *
      * @param TokenModelFactory $tokenModelFactory
      * @param AccountManagementInterface $accountManagement
      * @param TokenCollectionFactory $tokenModelCollectionFactory
      * @param \Magento\Integration\Model\CredentialsValidator $validatorHelper
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
      */
     public function __construct(
         TokenModelFactory $tokenModelFactory,
         AccountManagementInterface $accountManagement,
         TokenCollectionFactory $tokenModelCollectionFactory,
-        CredentialsValidator $validatorHelper
+        CredentialsValidator $validatorHelper,
+        ManagerInterface $eventManager = null
     ) {
         $this->tokenModelFactory = $tokenModelFactory;
         $this->accountManagement = $accountManagement;
         $this->tokenModelCollectionFactory = $tokenModelCollectionFactory;
         $this->validatorHelper = $validatorHelper;
+        $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ManagerInterface::class);
     }
 
     /**
@@ -83,6 +93,7 @@ public function createCustomerAccessToken($username, $password)
                 __('You did not sign in correctly or your account is temporarily disabled.')
             );
         }
+        $this->eventManager->dispatch('customer_login', ['customer' => $customerDataObject]);
         $this->getRequestThrottler()->resetAuthenticationFailuresCount($username, RequestThrottler::USER_TYPE_CUSTOMER);
         return $this->tokenModelFactory->create()->createCustomerToken($customerDataObject->getId())->getToken();
     }
diff --git a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
@@ -32,6 +32,9 @@ class CustomerTokenServiceTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Integration\Model\Oauth\Token|\PHPUnit_Framework_MockObject_MockObject */
     private $_tokenMock;
 
+    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $manager;
+
     protected function setUp()
     {
         $this->_tokenFactoryMock = $this->getMockBuilder(\Magento\Integration\Model\Oauth\TokenFactory::class)
@@ -67,11 +70,14 @@ protected function setUp()
             \Magento\Integration\Model\CredentialsValidator::class
         )->disableOriginalConstructor()->getMock();
 
+        $this->manager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+
         $this->_tokenService = new \Magento\Integration\Model\CustomerTokenService(
             $this->_tokenFactoryMock,
             $this->_accountManagementMock,
             $this->_tokenModelCollectionFactoryMock,
-            $this->validatorHelperMock
+            $this->validatorHelperMock,
+            $this->manager
         );
     }
 
diff --git a/app/code/Magento/Integration/etc/webapi_rest/events.xml b/app/code/Magento/Integration/etc/webapi_rest/events.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="customer_login">
+        <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
+    </event>
+</config>
diff --git a/app/code/Magento/Integration/etc/webapi_soap/events.xml b/app/code/Magento/Integration/etc/webapi_soap/events.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="customer_login">
+        <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
+    </event>
+</config>
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
@@ -285,7 +285,7 @@ public function update()
                 for ($versionFrom = $lastVersionId; $versionFrom < $currentVersionId; $versionFrom += $versionBatchSize) {
                     // Don't go past the current version for atomicy.
                     $versionTo = min($currentVersionId, $versionFrom + $versionBatchSize);
-                    $ids = $this->getChangelog()->getList($versionFrom, $versionTo);
+                    $ids = array_map('intval', $this->getChangelog()->getList($versionFrom, $versionTo));
 
                     // We run the actual indexer in batches.  Chunked AFTER loading to avoid duplicates in separate chunks.
                     $chunks = array_chunk($ids, $batchSize);

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private function getCategoryIds(Filter $filter): array`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- return array_unique(array_merge($categoryIds, ...$childCategoryIds));`
	`105`	`+ return array_map('intval', array_unique(array_merge($categoryIds, ...$childCategoryIds)));`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`