Skip to content

Commit 1d08737

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr46
2 parents ba45518 + 1118adc commit 1d08737

File tree

113 files changed

+710
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+710
-282
lines changed

‎app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public function getItems()
127127
*/
128128
public function sortButtons(Item $itemA, Item $itemB)
129129
{
130-
$sortOrderA = (int) $itemA->getSortOrder();
131-
$sortOrderB = (int) $itemB->getSortOrder();
130+
$sortOrderA = (int)$itemA->getSortOrder();
131+
$sortOrderB = (int)$itemB->getSortOrder();
132132

133133
if ($sortOrderA == $sortOrderB) {
134134
return 0;

‎app/code/Magento/Backend/Model/Menu.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function add(Item $item, $parentId = null, $index = null)
8383
}
8484
$parentItem->getChildren()->add($item, null, $index);
8585
} else {
86-
$index = (int) $index;
86+
$index = (int)$index;
8787
if (!isset($this[$index])) {
8888
$this->offsetSet($index, $item);
8989
$this->_logger->info(

‎app/code/Magento/Backup/Model/Config/Backend/Cron.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public function afterSave()
7676

7777
if ($enabled) {
7878
$cronExprArray = [
79-
(int) $time[1], # Minute
80-
(int) $time[0], # Hour
81-
$frequency == $frequencyMonthly ? '1' : '*', # Day of the Month
82-
'*', # Month of the Year
83-
$frequency == $frequencyWeekly ? '1' : '*', # Day of the Week
79+
(int)$time[1], # Minute
80+
(int)$time[0], # Hour
81+
$frequency == $frequencyMonthly ? '1' : '*', # Day of the Month
82+
'*', # Month of the Year
83+
$frequency == $frequencyWeekly ? '1' : '*', # Day of the Week
8484
];
8585
$cronExprString = implode(' ', $cronExprArray);
8686
} else {

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
namespace Magento\Bundle\Model\Product;
1010

11-
use Magento\Framework\App\ObjectManager;
11+
use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
12+
use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
1213
use Magento\Catalog\Api\ProductRepositoryInterface;
14+
use Magento\Framework\App\ObjectManager;
15+
use Magento\Framework\EntityManager\MetadataPool;
1316
use Magento\Framework\Pricing\PriceCurrencyInterface;
1417
use Magento\Framework\Serialize\Serializer\Json;
15-
use Magento\Framework\EntityManager\MetadataPool;
16-
use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
17-
use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
1818

1919
/**
2020
* Bundle Type Model
@@ -539,7 +539,7 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
539539
foreach ($options as $quoteItemOption) {
540540
if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
541541
if ($optionUpdateFlag) {
542-
$quoteItemOption->setValue((int) $quoteItemOption->getValue());
542+
$quoteItemOption->setValue((int)$quoteItemOption->getValue());
543543
} else {
544544
$quoteItemOption->setValue($value);
545545
}
@@ -561,7 +561,7 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
561561
*/
562562
public function prepareQuoteItemQty($qty, $product)
563563
{
564-
return (int) $qty;
564+
return (int)$qty;
565565
}
566566

567567
/**

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ protected function _prepareForm()
8181
*/
8282
protected function _getSetId()
8383
{
84-
return (int) $this->getRequest()->getParam('id') > 0
85-
? (int) $this->getRequest()->getParam('id')
84+
return (int)$this->getRequest()->getParam('id') > 0
85+
? (int)$this->getRequest()->getParam('id')
8686
: $this->_typeFactory->create()->load(
8787
$this->_coreRegistry->registry('entityType')
8888
)->getDefaultAttributeSetId();

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function getFieldSuffix()
7474
public function getStoreId()
7575
{
7676
$storeId = $this->getRequest()->getParam('store');
77-
return (int) $storeId;
77+
return (int)$storeId;
7878
}
7979

8080
/**

‎app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ public function getRowCount()
171171
*/
172172
public function setColumnCount($columns)
173173
{
174-
if ((int) $columns > 0) {
175-
$this->_columnCount = (int) $columns;
174+
if ((int)$columns > 0) {
175+
$this->_columnCount = (int)$columns;
176176
}
177177
return $this;
178178
}
@@ -214,8 +214,8 @@ public function getIterableItem()
214214
*/
215215
public function setItemLimit($type, $limit)
216216
{
217-
if ((int) $limit > 0) {
218-
$this->_itemLimits[$type] = (int) $limit;
217+
if ((int)$limit > 0) {
218+
$this->_itemLimits[$type] = (int)$limit;
219219
}
220220
return $this;
221221
}

‎app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function getCacheKeyInfo()
139139
[
140140
$this->getDisplayType(),
141141
$this->getProductsPerPage(),
142-
intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
142+
(int)$this->getRequest()->getParam($this->getData('page_var_name'), 1),
143143
$this->serializer->serialize($this->getRequest()->getParams())
144144
]
145145
);

‎app/code/Magento/Catalog/Model/Category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ public function getParentId()
721721
return $parentId;
722722
}
723723
$parentIds = $this->getParentIds();
724-
return (int) array_pop($parentIds);
724+
return (int)array_pop($parentIds);
725725
}
726726

727727
/**

‎app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function getColumns()
113113
public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
114114
{
115115
if (is_string($storeId)) {
116-
$storeId = (int) $storeId;
116+
$storeId = (int)$storeId;
117117
}
118118

119119
$suffix = sprintf('store_%d', $storeId);

0 commit comments

Comments
 (0)