New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run PHP CS Fixer #10276

Merged
merged 1 commit into from Sep 4, 2018
Jump to file or symbol
Failed to load files and symbols.
+17 −16
Diff settings

Always

Just for now

Copy path View file
@@ -3285,7 +3285,7 @@ public function getOrderShippingCost($id_carrier = null, $use_tax = true, Countr
* @param int $id_carrier Carrier ID (default : current carrier)
* @param bool $use_tax
* @param Country|null $default_country
* @param array|null $product_list List of product concerned by the shipping.
* @param array|null $product_list list of product concerned by the shipping.
* If null, all the product of the cart are used to calculate the shipping cost
* @param int|null $id_zone Zone ID
*
Copy path View file
@@ -850,10 +850,10 @@ public function checkProductRestrictions(Context $context, $returnProducts = fal
* @param \Cart $cart
* @param bool $returnProducts [default=false]
* If true, this method will return an array of eligible products.
* Otherwise, it returns TRUE on success and string|false on errors (depending on the value of $displayError).
* Otherwise, it returns TRUE on success and string|false on errors (depending on the value of $displayError)
* @param bool $displayError [default=false]
* If true, this method will return an error message instead of FALSE on errors.
* Otherwise, it returns FALSE on errors.
* Otherwise, it returns FALSE on errors
* @param bool $alreadyInCart
*
* @return array|bool|string
Copy path View file
@@ -117,7 +117,7 @@ class MailCore extends ObjectModel
* @param string $toName To name
* @param string $from From email
* @param string $fromName To email
* @param array $fileAttachment Array with three parameters (content, mime and name).
* @param array $fileAttachment array with three parameters (content, mime and name).
* You can use an array of array to attach multiple files
* @param bool $mode_smtp SMTP mode (deprecated)
* @param string $templatePath Template path
Copy path View file
@@ -3074,9 +3074,9 @@ public static function getCover($id_product, Context $context = null)
*
* @param int $id_product Product id
* @param bool $usetax With taxes or not (optional)
* @param int|null $id_product_attribute Product attribute id (optional).
* @param int|null $id_product_attribute product attribute id (optional).
* If set to false, do not apply the combination price impact.
* NULL does apply the default combination price impact.
* NULL does apply the default combination price impact
* @param int $decimals Number of decimals (optional)
* @param int|null $divisor Useful when paying many time without fees (optional)
* @param bool $only_reduc Returns only the reduction amount
Copy path View file
@@ -68,7 +68,7 @@
public static $_servers = array();
/** @var null Flag used to load slave servers only once.
* See loadSlaveServers() method.
* See loadSlaveServers() method
*/
public static $_slave_servers_loaded = null;
@@ -102,7 +102,7 @@ class SupplyOrderDetailCore extends ObjectModel
public $quantity_received = 0;
/**
* @var float This defines the price of the product, considering the number of units to buy.
* @var float this defines the price of the product, considering the number of units to buy.
* ($unit_price_te * $quantity), without discount, without tax
*/
public $price_te = 0;
@@ -39,15 +39,16 @@ public function initContent()
$this->setTemplate('contact');
}
public function getBreadcrumbLinks()
{
$breadcrumb = parent::getBreadcrumbLinks();
$breadcrumb['links'][] = [
'title' => $this->getTranslator()->trans('Contact us', [], 'Shop.Theme.Global'),
'url' => $this->context->link->getPageLink('contact', true)
'url' => $this->context->link->getPageLink('contact', true),
];
return $breadcrumb;
}
}
@@ -67,7 +67,7 @@ public function getCurrencies($object = false, $active = true, $group_by = false
* An ISO 4217 currency code
* @param int|null $idLang
* Set this parameter if you want the currency in a specific language.
* If null, default language will be used.
* If null, default language will be used
*
* @return currency|null
* The asked Currency object, or null if not found
@@ -94,7 +94,7 @@ public function getCurrencyByIsoCode($isoCode, $idLang = null)
* An ISO 4217 currency code
* @param int|null $idLang
* Set this parameter if you want the currency in a specific language.
* If null, default language will be used.
* If null, default language will be used
*
* @return currency
* The asked Currency object, loaded with relevant data if passed ISO code is known
@@ -37,9 +37,9 @@ class PriceCalculator
/**
* @param int $idProduct Product id
* @param bool $useTax With taxes or not (optional)
* @param int|null $idProductAttribute Product attribute id (optional).
* @param int|null $idProductAttribute product attribute id (optional).
* If set to false, do not apply the combination price impact.
* NULL does apply the default combination price impact.
* NULL does apply the default combination price impact
* @param int $decimals Number of decimals (optional)
* @param int|null $divisor Useful when paying many time without fees (optional)
* @param bool $onlyReduc Returns only the reduction amount
@@ -55,8 +55,8 @@ class AdminSecurity extends Security
protected $redirectRoute;
/**
* @deprecated Once the back office is migrated, rely only on route.
* The url for the redirection.
* @deprecated once the back office is migrated, rely only on route.
* The url for the redirection
*
* @return string
*/
ProTip! Use n and p to navigate between commits in a pull request.