fix psr

composer.json

@@ -62,5 +62,26 @@
         "branch-alias": {
             "dev-master": "2.0.0-dev"
         }
-    }
+    },
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "name": "smarty/smarty",
+                "version": "3.1.14",
+                "dist": {
+                    "url": "http://www.smarty.net/files/Smarty-3.1.14.zip",
+                    "type": "zip"
+                },
+                "source": {
+                    "url": "http://smarty-php.googlecode.com/svn/",
+                    "type": "svn",
+                    "reference": "tags/Smarty_3_1_14/distribution/"
+                },
+                "autoload": {
+                    "classmap": ["libs/"]
+                }
+            }
+        }
+    ]
 }

composer.lock

@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "f779af80bcfc2ed1deefba9350bdcf66",
+    "hash": "ee6fe7504a35ea7e3a905b2da0de3f13",
     "packages": [
         {
             "name": "ensepar/html2pdf",
@@ -512,47 +512,24 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.14",
+            "version": "3.1.14",
             "source": {
                 "type": "svn",
-                "url": "http://smarty-php.googlecode.com/svn",
+                "url": "http://smarty-php.googlecode.com/svn/",
-                "reference": "/tags/v3.1.14/@4752"
+                "reference": "tags/Smarty_3_1_14/distribution/"
             },
-            "require": {
+            "dist": {
-                "php": ">=5.2"
+                "type": "zip",
+                "url": "http://www.smarty.net/files/Smarty-3.1.14.zip",
+                "reference": null,
+                "shasum": null
             },
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "distribution/libs/Smarty.class.php",
+                    "libs/"
-                    "distribution/libs/SmartyBC.class.php",
-                    "distribution/libs/sysplugins/smarty_security.php"
                 ]
-            },
+            }
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Monte Ohrt",
-                    "email": "monte@ohrt.com"
-                },
-                {
-                    "name": "Uwe Tews",
-                    "email": "uwe.tews@googlemail.com"
-                },
-                {
-                    "name": "Rodney Rehm",
-                    "email": "rodney.rehm@medialize.de"
-                }
-            ],
-            "description": "Smarty - the compiling PHP template engine",
-            "homepage": "http://www.smarty.net",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2013-07-02 16:38:47"
         },
         {
             "name": "swiftmailer/swiftmailer",

core/lib/Thelia/Action/Module.php

@@ -94,8 +94,7 @@ class Module extends BaseAction implements EventSubscriberInterface
 
                     $fs = new Filesystem();
                     $fs->remove($path);
-                }
+                } catch (\ReflectionException $ex) {
-                catch (\ReflectionException $ex) {
                     // Happens probably because the module directory has been deleted.
                     // Log a warning, and delete the database entry.
                     Tlog::getInstance()->addWarning(

core/lib/Thelia/Command/CreateAdminUser.php

@@ -91,6 +91,7 @@ class CreateAdminUser extends ContainerAwareCommand
     protected function enterData($dialog, $output, $label, $error_message, $hidden = false)
     {
         $command = $hidden ? 'askHiddenResponse' : 'askAndValidate';
+
         return $dialog->$command(
             $output,
             $this->decorateInfo($label),

core/lib/Thelia/Command/ModuleGenerateCommand.php

@@ -110,8 +110,7 @@ class ModuleGenerateCommand extends BaseModuleGenerate
             $schemaContent = str_replace("%%NAMESPACE%%", $this->module, $schemaContent);
 
             file_put_contents($this->moduleDirectory . DIRECTORY_SEPARATOR . "Config". DIRECTORY_SEPARATOR . "schema.xml", $schemaContent);
-        }
+        } catch (\Exception $ex) {
-        catch (\Exception $ex) {
             $fs->remove($this->moduleDirectory);
 
             throw $ex;

core/lib/Thelia/Command/Skeleton/Module/Class.php

@@ -33,4 +33,4 @@ class %%CLASSNAME%% extends BaseModule
      *
      * Have fun !
      */
-}
+}

core/lib/Thelia/Command/Skeleton/Module/config.xml

@@ -22,12 +22,6 @@
         -->
     </commands>
 
-    <templateDirectives>
-        <!-- Sample definition
-        <templateDirectives class="MyModule\Directive\MyTemplateDirective" name="my_filter"/>
-        -->
-    </templateDirectives>
-
     <!--
     <services>
 

core/lib/Thelia/Command/Skeleton/Module/module.xml

@@ -15,4 +15,4 @@
     <type>classic</type>
     <thelia>2.0.0</thelia>
     <stability>other</stability>
-</module>
+</module>

core/lib/Thelia/Controller/Admin/BaseAdminController.php

@@ -56,11 +56,13 @@ class BaseAdminController extends BaseController
      */
     private $currentRouter = "router.admin";
 
-    protected function getCurrentRouter() {
+    protected function getCurrentRouter()
+    {
         return $this->currentRouter;
     }
 
-    protected function setCurrentRouter($routerId) {
+    protected function setCurrentRouter($routerId)
+    {
         $this->currentRouter = $routerId;
     }
 

core/lib/Thelia/Controller/Admin/ContentController.php

@@ -242,6 +242,7 @@ class ContentController extends AbstractSeoCrudController
         if (null !== $content) {
             $content->setLocale($this->getCurrentEditionLocale());
         }
+
         return $content;
     }
 

core/lib/Thelia/Controller/Admin/FolderController.php

@@ -205,6 +205,7 @@ class FolderController extends AbstractSeoCrudController
         if (null !== $folder) {
             $folder->setLocale($this->getCurrentEditionLocale());
         }
+
         return $folder;
     }
 

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;
     }
-}
+}