Applied php-cs-fixer

core/lib/Thelia/Action/Coupon.php

@@ -28,8 +28,6 @@ use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Model\Coupon as CouponModel;
 use Thelia\Model\CouponCountry;
 use Thelia\Model\CouponCountryQuery;
-use Thelia\Model\CouponCustomerCount;
-use Thelia\Model\CouponCustomerCountQuery;
 use Thelia\Model\CouponModule;
 use Thelia\Model\CouponModuleQuery;
 use Thelia\Model\CouponQuery;
@@ -334,8 +332,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
                 }
 
                 $con->commit();
-            }
+            } catch (\Exception  $ex) {
-            catch (\Exception  $ex) {
                 $con->rollBack();
 
                 throw($ex);

core/lib/Thelia/Condition/Implementation/AbstractMatchCountries.php

@@ -44,9 +44,9 @@ abstract class AbstractMatchCountries extends ConditionAbstract
         parent::__construct($facade);
     }
 
-    protected abstract function getSummaryLabel($cntryStrList, $i18nOperator);
+    abstract protected function getSummaryLabel($cntryStrList, $i18nOperator);
 
-    protected abstract function getFormLabel();
+    abstract protected function getFormLabel();
 
     /**
      * @inheritdoc
@@ -87,6 +87,7 @@ abstract class AbstractMatchCountries extends ConditionAbstract
         // The delivery address should match one of the selected countries.
 
         /* TODO !!!! */
+
         return $this->conditionValidator->variableOpComparison(
             $this->facade->getNbArticlesInCart(),
             $this->operators[self::COUNTRIES_LIST],

core/lib/Thelia/Condition/Implementation/CartContainsProducts.php

@@ -99,7 +99,6 @@ class CartContainsProducts extends ConditionAbstract
                     $cartItem->getProduct()->getId(),
                     $this->operators[self::PRODUCTS_LIST],
                     $this->values[self::PRODUCTS_LIST])) {
-
                     return true;
             }
         }

core/lib/Thelia/Condition/Implementation/ConditionAbstract.php

@@ -73,8 +73,8 @@ abstract class ConditionAbstract implements ConditionInterface
      *
      * @throws \Thelia\Exception\InvalidConditionOperatorException if the operator value is not in the allowed value
      */
-    protected function checkComparisonOperatorValue($operatorList, $parameterName) {
+    protected function checkComparisonOperatorValue($operatorList, $parameterName)
-
+    {
         $isOperator1Legit = $this->isOperatorLegit(
             $operatorList[$parameterName],
             $this->availableOperators[$parameterName]

core/lib/Thelia/Condition/Implementation/MatchBillingCountries.php

@@ -69,8 +69,8 @@ class MatchBillingCountries extends AbstractMatchCountries
         return $toolTip;
     }
 
-    protected function getSummaryLabel($cntryStrList, $i18nOperator) {
+    protected function getSummaryLabel($cntryStrList, $i18nOperator)
-
+    {
         return $this->translator->trans(
             'Only if order billing country is %op% <strong>%countries_list%</strong>', [
                 '%countries_list%' => $cntryStrList,
@@ -79,7 +79,8 @@ class MatchBillingCountries extends AbstractMatchCountries
         );
     }
 
-    protected function getFormLabel() {
+    protected function getFormLabel()
+    {
         return $this->translator->trans(
             'Billing coutry is', [], 'condition'
         );

core/lib/Thelia/Condition/Implementation/MatchDeliveryCountries.php

@@ -69,8 +69,8 @@ class MatchDeliveryCountries extends AbstractMatchCountries
         return $toolTip;
     }
 
-    protected function getSummaryLabel($cntryStrList, $i18nOperator) {
+    protected function getSummaryLabel($cntryStrList, $i18nOperator)
-
+    {
         return $this->translator->trans(
             'Only if order shipping country is %op% <strong>%countries_list%</strong>', [
                 '%countries_list%' => $cntryStrList,
@@ -79,7 +79,8 @@ class MatchDeliveryCountries extends AbstractMatchCountries
         );
     }
 
-    protected function getFormLabel() {
+    protected function getFormLabel()
+    {
         return $this->translator->trans(
             'Delivery coutry is', [], 'condition'
         );

core/lib/Thelia/Condition/Implementation/MatchForEveryone.php

@@ -26,8 +26,8 @@ class MatchForEveryone extends ConditionAbstract
     /**
      * @inheritdoc
      */
-    public function __construct(FacadeInterface $facade) {
+    public function __construct(FacadeInterface $facade)
-
+    {
         // Define the allowed comparison operators
         $this->availableOperators = [];
 

core/lib/Thelia/Condition/Implementation/MatchForXArticles.php

@@ -14,7 +14,6 @@ namespace Thelia\Condition\Implementation;
 
 use Thelia\Condition\Operators;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Exception\InvalidConditionOperatorException;
 use Thelia\Exception\InvalidConditionValueException;
 
 /**

core/lib/Thelia/Condition/Implementation/StartDate.php

@@ -14,11 +14,7 @@ namespace Thelia\Condition\Implementation;
 
 use Thelia\Condition\Operators;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Exception\InvalidConditionOperatorException;
 use Thelia\Exception\InvalidConditionValueException;
-use Thelia\Model\Category;
-use Thelia\Model\CategoryImageQuery;
-use Thelia\Model\CategoryQuery;
 use Thelia\Tools\DateTimeFormat;
 
 /**
@@ -76,8 +72,7 @@ class StartDate extends ConditionAbstract
             }
 
             $timestamp = $date->getTimestamp();
-        }
+        } else {
-        else {
             $timestamp = $values[self::START_DATE];
         }
 
@@ -147,7 +142,8 @@ class StartDate extends ConditionAbstract
         return $toolTip;
     }
 
-    private function getDateFormat() {
+    private function getDateFormat()
+    {
         return DateTimeFormat::getInstance($this->facade->getRequest())->getFormat("date");
     }
 
@@ -177,8 +173,7 @@ class StartDate extends ConditionAbstract
             $date->setTimestamp($this->values[self::START_DATE]);
 
             $strDate = $date->format($this->getDateFormat());
-        }
+        } else {
-        else {
             $strDate = '';
         }
 

core/lib/Thelia/Core/Event/Coupon/CouponConsumeEvent.php

@@ -57,6 +57,7 @@ class CouponConsumeEvent extends ActionEvent
     public function setFreeShipping($freeShipping)
     {
         $this->freeShipping = $freeShipping;
+
         return $this;
     }
 

core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php

@@ -134,6 +134,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
     public function setPerCustomerUsageCount($perCustomerUsageCount)
     {
         $this->perCustomerUsageCount = $perCustomerUsageCount;
+
         return $this;
     }
 
@@ -152,6 +153,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
     public function setFreeShippingForCountries($freeShippingForCountries)
     {
         $this->freeShippingForCountries = $freeShippingForCountries;
+
         return $this;
     }
 
@@ -170,6 +172,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
     public function setFreeShippingForMethods($freeShippingForMethods)
     {
         $this->freeShippingForMethods = $freeShippingForMethods;
+
         return $this;
     }
 

core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php

@@ -162,8 +162,7 @@ class SmartyAssetsManager
                 $filters,
                 $debug
             );
-        }
+        } else {
-        else {
             Tlog::getInstance()->addError("Asset $assetSource".DS."$file was not found.");
         }
 

core/lib/Thelia/Coupon/BaseFacade.php

@@ -78,8 +78,7 @@ class BaseFacade implements FacadeInterface
     {
         try {
             return AddressQuery::create()->findPk($this->getRequest()->getSession()->getOrder()->getChoosenDeliveryAddress());
-        }
+        } catch (\Exception $ex) {
-        catch(\Exception $ex) {
             throw new \LogicException("Failed to get delivery address (" . $ex->getMessage() . ")");
         }
     }

core/lib/Thelia/Coupon/CouponManager.php

@@ -23,8 +23,6 @@ use Thelia\Model\CouponCountry;
 use Thelia\Model\CouponCustomerCount;
 use Thelia\Model\CouponCustomerCountQuery;
 use Thelia\Model\Order;
-use Thelia\Model\OrderAddress;
-use Thelia\Model\OrderAddressQuery;
 
 /**
  * Manage how Coupons could interact with a Checkout
@@ -318,8 +316,7 @@ class CouponManager
                     ;
 
                     $ret = $usageLeft - $newCount;
-                }
+                } else {
-                else {
                     $usageLeft--;
 
                     $coupon->setMaxUsage($usageLeft);

core/lib/Thelia/Coupon/Type/CouponAbstract.php

@@ -176,6 +176,7 @@ abstract class CouponAbstract implements CouponInterface
     public function setPerCustomerUsageCount($perCustomerUsageCount)
     {
         $this->perCustomerUsageCount = $perCustomerUsageCount;
+
         return $this;
     }
 
@@ -187,7 +188,6 @@ abstract class CouponAbstract implements CouponInterface
         return $this->perCustomerUsageCount;
     }
 
-
     /**
      * Return Coupon code (ex: XMAS)
      *
@@ -253,14 +253,16 @@ abstract class CouponAbstract implements CouponInterface
     /**
      * @return array list of country IDs for which shipping is free. All if empty
      */
-    public function getFreeShippingForCountries() {
+    public function getFreeShippingForCountries()
+    {
         return $this->freeShippingForCountries;
     }
 
     /**
      * @return array list of module IDs for which shipping is free. All if empty
      */
-    public function getFreeShippingForModules() {
+    public function getFreeShippingForModules()
+    {
         return $this->freeShippingForModules;
     }
 

core/lib/Thelia/Coupon/Type/CouponInterface.php

@@ -15,8 +15,6 @@ namespace Thelia\Coupon\Type;
 use Propel\Runtime\Collection\ObjectCollection;
 use Thelia\Condition\ConditionCollection;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Model\CouponCountry;
-use Thelia\Model\CouponModule;
 
 /**
  * Represents a Coupon ready to be processed in a Checkout process

core/lib/Thelia/Form/CouponCreationForm.php

@@ -18,13 +18,10 @@ use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\NotEqualTo;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Core\Translation\Translator;
-use Thelia\Model\Base\CountryI18n;
 use Thelia\Model\Base\CountryQuery;
 use Thelia\Model\Base\LangQuery;
 use Thelia\Model\Base\ModuleQuery;
-use Thelia\Model\CountryI18nQuery;
 use Thelia\Model\Module;
-use Thelia\Model\ModuleI18nQuery;
 use Thelia\Module\BaseModule;
 
 /**

core/lib/Thelia/Tests/Coupon/CouponManagerTest.php

@@ -19,7 +19,6 @@ use Thelia\Condition\Implementation\MatchForTotalAmount;
 use Thelia\Condition\Operators;
 use Thelia\Coupon\Type\RemoveXAmount;
 use Thelia\Model\Coupon;
-use Thelia\Model\CouponCountry;
 use Thelia\Model\CurrencyQuery;
 use Thelia\Model\Order;