Merge branch 'master' of https://github.com/thelia/thelia

core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php

@@ -248,5 +248,4 @@ class CustomerCreateOrUpdateEvent extends CustomerEvent
         return $this->ref;
     }
 
-
 }

core/lib/Thelia/Core/Event/Module/ModuleDeleteEvent.php

@@ -65,6 +65,7 @@ class ModuleDeleteEvent extends ModuleEvent
     public function setDeleteData($delete_data)
     {
         $this->delete_data = $delete_data;
+
         return $this;
     }
-}
+}

core/lib/Thelia/Core/Event/Product/ProductCombinationGenerationEvent.php

@@ -151,7 +151,6 @@ class ProductCombinationGenerationEvent extends ProductEvent
         $this->ean_code = $ean_code;
 
         return $this;
-        return $this;
     }
 
     public function getCombinations()

core/lib/Thelia/Core/Event/Tax/TaxEvent.php

@@ -129,4 +129,4 @@ class TaxEvent extends ActionEvent
     {
         return $this->requirements;
     }
-}
+}

core/lib/Thelia/Core/Event/Tax/TaxRuleEvent.php

@@ -129,4 +129,4 @@ class TaxRuleEvent extends ActionEvent
     {
         return $this->taxList;
     }
-}
+}

core/lib/Thelia/Core/EventListener/ViewListener.php

@@ -115,7 +115,7 @@ class ViewListener implements EventSubscriberInterface
     {
         $request = $this->container->get('request');
 
-        if (null === $view = $request->attributes->get('_view')) {
+        if (null === $request->attributes->get('_view')) {
             $request->attributes->set('_view', $this->findView($request));
         }
 

core/lib/Thelia/Core/HttpFoundation/Request.php

@@ -34,11 +34,6 @@ use Symfony\Component\HttpFoundation\Request as BaseRequest;
 class Request extends BaseRequest
 {
 
-    private $excludeContent = array(
-        'username',
-        'password'
-    );
-
     public function getProductId()
     {
         return $this->get("product_id");

core/lib/Thelia/Core/Security/SecurityContext.php

@@ -104,12 +104,8 @@ class SecurityContext
             // Check if user's roles matches required roles
             $userRoles = $user->getRoles();
 
-            $roleFound = false;
-
             foreach ($userRoles as $role) {
                 if (in_array($role, $roles)) {
-                    $roleFound = true;
-
                     return true;
                 }
             }

core/lib/Thelia/Core/Template/Element/BaseLoop.php

@@ -179,7 +179,7 @@ abstract class BaseLoop
                 $faultActor[] = $argument->name;
                 $faultDetails[] = sprintf('"%s" parameter is missing in loop type: %s, name: %s', $argument->name, $loopType, $loopName);
             } else  if ($value === '') {
-                if(!$argument->empty) {
+                if (!$argument->empty) {
                     /* check if empty */
                     $faultActor[] = $argument->name;
                     $faultDetails[] = sprintf('"%s" parameter cannot be empty in loop type: %s, name: %s', $argument->name, $loopType, $loopName);

core/lib/Thelia/Core/Template/Loop/Argument/Argument.php

@@ -58,8 +58,6 @@ class Argument
 
     public function setValue($value)
     {
-        $x = $value === null;
-
         if ($value === null) {
             $this->value = null;
         } else {
@@ -70,7 +68,6 @@ class Argument
                 $this->value = (string) $value;
             }
         }
-        //$this->value = $value === null ? null : (string) $value;
     }
 
     public static function createAnyTypeArgument($name, $default=null, $mandatory=false, $empty=true)

core/lib/Thelia/Core/Template/Loop/Attribute.php

@@ -79,10 +79,6 @@ class Attribute extends BaseI18nLoop implements PropelSearchLoopInterface
     {
         $search = AttributeQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
         $this->configureI18nProcessing($search);
 

core/lib/Thelia/Core/Template/Loop/Document.php

@@ -219,9 +219,6 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface
         if (!is_null($exclude))
             $search->filterById($exclude, Criteria::NOT_IN);
 
-        // Create document processing event
-        $event = new DocumentEvent($this->request);
-
         return $search;
 
     }

core/lib/Thelia/Core/Template/Loop/Module.php

@@ -194,7 +194,6 @@ class Module extends BaseI18nLoop implements PropelSearchLoopInterface
 
             $hasConfigurationInterface = false;
 
-
             /* first test if module defines it's own config route  */
             if ($module->getActivate()) {
                 // Works only fo activated modules - see Thelia\Core\DependencyInjection\Compiler\RegisterRouterPass
@@ -215,8 +214,7 @@ class Module extends BaseI18nLoop implements PropelSearchLoopInterface
                         $hasConfigurationInterface = true;
                     }
                 }
-            }
-            else {
+            } else {
                 // Make a quick and dirty test on the module's routing.xml file
                 $routing = @file_get_contents($module->getAbsoluteBaseDir() . DS . "Config" . DS . "routing.xml");
 

core/lib/Thelia/Core/Template/Loop/ProductTemplate.php

@@ -62,12 +62,8 @@ class ProductTemplate extends BaseI18nLoop implements PropelSearchLoopInterface
     {
         $search = TemplateQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        $this->configureI18nProcessing($search, $columns = array('NAME'));
+        $this->configureI18nProcessing($search, array('NAME'));
 
         $id = $this->getId();