Skip to content

Commit 67a9083

Browse files
committed
Merge branch 'MAGETWO-90366' into 2.2-develop-mftf-pr4
# Conflicts: # app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml # app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
2 parents 9416b2c + 2dd6aa1 commit 67a9083

File tree

169 files changed

+3341
-838
lines changed

Some content is hidden

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

169 files changed

+3341
-838
lines changed

app/code/Magento/Backend/App/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ public function isSetFlag($path)
6868
if ($path) {
6969
$configPath .= '/' . $path;
7070
}
71-
return (bool) $this->appConfig->get(System::CONFIG_TYPE, $configPath);
71+
return (bool)$this->appConfig->get(System::CONFIG_TYPE, $configPath);
7272
}
7373
}

app/code/Magento/Backup/Model/ResourceModel/Db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function getTableForeignKeysSql($tableName = null)
115115
}
116116

117117
/**
118-
* Return triggers fro table(s)
118+
* Return triggers for table(s)
119119
*
120120
* @param string|null $tableName
121121
* @param bool $addDropIfExists

app/code/Magento/Braintree/Gateway/Config/Config.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function getCountryAvailableCardTypes($country, $storeId = null)
131131
*/
132132
public function isCvvEnabled($storeId = null)
133133
{
134-
return (bool) $this->getValue(self::KEY_USE_CVV, $storeId);
134+
return (bool)$this->getValue(self::KEY_USE_CVV, $storeId);
135135
}
136136

137137
/**
@@ -142,7 +142,7 @@ public function isCvvEnabled($storeId = null)
142142
*/
143143
public function isVerify3DSecure($storeId = null)
144144
{
145-
return (bool) $this->getValue(self::KEY_VERIFY_3DSECURE, $storeId);
145+
return (bool)$this->getValue(self::KEY_VERIFY_3DSECURE, $storeId);
146146
}
147147

148148
/**
@@ -233,7 +233,7 @@ public function getSdkUrl()
233233
*/
234234
public function hasFraudProtection($storeId = null)
235235
{
236-
return (bool) $this->getValue(Config::FRAUD_PROTECTION, $storeId);
236+
return (bool)$this->getValue(Config::FRAUD_PROTECTION, $storeId);
237237
}
238238

239239
/**
@@ -244,7 +244,7 @@ public function hasFraudProtection($storeId = null)
244244
*/
245245
public function isActive($storeId = null)
246246
{
247-
return (bool) $this->getValue(self::KEY_ACTIVE, $storeId);
247+
return (bool)$this->getValue(self::KEY_ACTIVE, $storeId);
248248
}
249249

250250
/**

app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ public function __construct(
6060
*/
6161
public function isActive()
6262
{
63-
return (bool) $this->getValue(self::KEY_ACTIVE);
63+
return (bool)$this->getValue(self::KEY_ACTIVE);
6464
}
6565

6666
/**
6767
* @return bool
6868
*/
6969
public function isDisplayShoppingCart()
7070
{
71-
return (bool) $this->getValue(self::KEY_DISPLAY_ON_SHOPPING_CART);
71+
return (bool)$this->getValue(self::KEY_DISPLAY_ON_SHOPPING_CART);
7272
}
7373

7474
/**
@@ -78,7 +78,7 @@ public function isDisplayShoppingCart()
7878
*/
7979
public function isAllowToEditShippingAddress()
8080
{
81-
return (bool) $this->getValue(self::KEY_ALLOW_TO_EDIT_SHIPPING_ADDRESS);
81+
return (bool)$this->getValue(self::KEY_ALLOW_TO_EDIT_SHIPPING_ADDRESS);
8282
}
8383

8484
/**
@@ -117,7 +117,7 @@ public function getTitle()
117117
*/
118118
public function isSkipOrderReview()
119119
{
120-
return (bool) $this->getValue('skip_order_review');
120+
return (bool)$this->getValue('skip_order_review');
121121
}
122122

123123
/**

0 commit comments

Comments
 (0)