Merge branch 'libs-upgrade' of https://github.com/magento-engcom/php-7.2-support into libs-upgrade

Joan He · Joan He · commit 3a1a7eb3e11b · 2018-04-02T08:46:41.000-05:00
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -76,7 +76,7 @@ public function execute(Observer $observer)
             $wishlistIds = [$singleWishlistId];
         }
 
-        if (count($wishlistIds) && $request->getParam('wishlist_next')) {
+        if (is_array($wishlistIds) && count($wishlistIds) && $request->getParam('wishlist_next')) {
             $wishlistId = array_shift($wishlistIds);
 
             if ($this->customerSession->isLoggedIn()) {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function execute(Observer $observer)`
`76`	`76`	`$wishlistIds = [$singleWishlistId];`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (count($wishlistIds) && $request->getParam('wishlist_next')) {`
	`79`	`+ if (is_array($wishlistIds) && count($wishlistIds) && $request->getParam('wishlist_next')) {`
`80`	`80`	`$wishlistId = array_shift($wishlistIds);`
`81`	`81`
`82`	`82`	`if ($this->customerSession->isLoggedIn()) {`