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

composer.json

@@ -9,7 +9,7 @@
     },
     "require":{
         "php": ">=5.4",
-        "ircmaxell/password-compat": "dev-master",
+        "ircmaxell/password-compat": "1.0.*",
         "propel/propel": "dev-master",
         "psr/log" : "1.0",
         "symfony/class-loader": "2.2.*",
@@ -30,12 +30,12 @@
 
         "smarty/smarty": "v3.1.14",
         "kriswallsmith/assetic": "1.2.*@dev",
-        "leafo/lessphp": "0.3.*@dev",
+        "leafo/lessphp": "0.4.*",
-        "ptachoire/cssembed": "dev-master",
+        "ptachoire/cssembed": "1.0.*",
 
         "simplepie/simplepie": "dev-master",
 
-        "imagine/imagine": "dev-master",
+        "imagine/imagine": "0.*",
         "symfony/icu": "1.0",
         "swiftmailer/swiftmailer": "5.0.*",
         "symfony/serializer": "2.3.*",
@@ -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": "92d99dbb21763697accf7050ded155b6",
     "packages": [
         {
             "name": "ensepar/html2pdf",
@@ -111,7 +111,7 @@
         },
         {
             "name": "imagine/imagine",
-            "version": "dev-master",
+            "version": "v0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/avalanche123/Imagine.git",
@@ -163,16 +163,16 @@
         },
         {
             "name": "ircmaxell/password-compat",
-            "version": "dev-master",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "5d44eec3b571b4a6daae45794b0a31fbbf63c74c"
+                "reference": "1fc1521b5e9794ea77e4eca30717be9635f1d4f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5d44eec3b571b4a6daae45794b0a31fbbf63c74c",
+                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/1fc1521b5e9794ea77e4eca30717be9635f1d4f4",
-                "reference": "5d44eec3b571b4a6daae45794b0a31fbbf63c74c",
+                "reference": "1fc1521b5e9794ea77e4eca30717be9635f1d4f4",
                 "shasum": ""
             },
             "type": "library",
@@ -198,7 +198,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2013-06-24 12:01:11"
+            "time": "2013-04-30 19:58:08"
         },
         {
             "name": "kriswallsmith/assetic",
@@ -273,7 +273,7 @@
         },
         {
             "name": "leafo/lessphp",
-            "version": "dev-master",
+            "version": "v0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/leafo/lessphp.git",
@@ -417,7 +417,7 @@
         },
         {
             "name": "ptachoire/cssembed",
-            "version": "dev-master",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/krichprollsch/phpCssEmbed.git",
@@ -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",
@@ -2279,13 +2256,9 @@
     ],
     "minimum-stability": "stable",
     "stability-flags": {
-        "ircmaxell/password-compat": 20,
         "propel/propel": 20,
         "kriswallsmith/assetic": 20,
-        "leafo/lessphp": 20,
-        "ptachoire/cssembed": 20,
         "simplepie/simplepie": 20,
-        "imagine/imagine": 20,
         "fzaninotto/faker": 20,
         "maximebf/debugbar": 20
     },

core/lib/Thelia/Action/Attribute.php

@@ -74,7 +74,6 @@ class Attribute extends BaseAction implements EventSubscriberInterface
      */
     public function update(AttributeUpdateEvent $event)
     {
-        $search = AttributeQuery::create();
 
         if (null !== $attribute = AttributeQuery::create()->findPk($event->getAttributeId())) {
 

core/lib/Thelia/Action/AttributeAv.php

@@ -66,7 +66,6 @@ class AttributeAv extends BaseAction implements EventSubscriberInterface
      */
     public function update(AttributeAvUpdateEvent $event)
     {
-        $search = AttributeAvQuery::create();
 
         if (null !== $attribute = AttributeAvQuery::create()->findPk($event->getAttributeAvId())) {
 

core/lib/Thelia/Action/Cache.php

@@ -42,7 +42,7 @@ class Cache extends BaseAction implements EventSubscriberInterface
         $directoryBrowser = new \DirectoryIterator($dir);
 
         $fs = new Filesystem();
-        $fs->remove($dir);
+        $fs->remove($directoryBrowser);
 
     }
 

core/lib/Thelia/Action/Cart.php

@@ -91,7 +91,7 @@ class Cart extends BaseAction implements EventSubscriberInterface
     {
         if (null !== $cartItemId = $event->getCartItem()) {
             $cart = $event->getCart();
-            $cartItem = CartItemQuery::create()
+            CartItemQuery::create()
                 ->filterByCartId($cart->getId())
                 ->filterById($cartItemId)
                 ->delete();

core/lib/Thelia/Action/Config.php

@@ -58,7 +58,6 @@ class Config extends BaseAction implements EventSubscriberInterface
      */
     public function setValue(ConfigUpdateEvent $event)
     {
-        $search = ConfigQuery::create();
 
         if (null !== $config = $search->findPk($event->getConfigId())) {
 
@@ -78,7 +77,6 @@ class Config extends BaseAction implements EventSubscriberInterface
      */
     public function modify(ConfigUpdateEvent $event)
     {
-        $search = ConfigQuery::create();
 
         if (null !== $config = ConfigQuery::create()->findPk($event->getConfigId())) {
 

core/lib/Thelia/Action/Currency.php

@@ -95,7 +95,6 @@ class Currency extends BaseAction implements EventSubscriberInterface
      */
     public function setDefault(CurrencyUpdateEvent $event)
     {
-        $search = CurrencyQuery::create();
 
         if (null !== $currency = CurrencyQuery::create()->findPk($event->getCurrencyId())) {
 

core/lib/Thelia/Action/Feature.php

@@ -74,7 +74,6 @@ class Feature extends BaseAction implements EventSubscriberInterface
      */
     public function update(FeatureUpdateEvent $event)
     {
-        $search = FeatureQuery::create();
 
         if (null !== $feature = FeatureQuery::create()->findPk($event->getFeatureId())) {
 

core/lib/Thelia/Action/FeatureAv.php

@@ -66,7 +66,6 @@ class FeatureAv extends BaseAction implements EventSubscriberInterface
      */
     public function update(FeatureAvUpdateEvent $event)
     {
-        $search = FeatureAvQuery::create();
 
         if (null !== $feature = FeatureAvQuery::create()->findPk($event->getFeatureAvId())) {
 

core/lib/Thelia/Action/Image.php

@@ -355,7 +355,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
 
             $delta_x = $delta_y = $border_width = $border_height = 0;
 
-            if ($width_diff > 1 AND $height_diff > 1) {
+            if ($width_diff > 1 && $height_diff > 1) {
 
                 $next_width = $width_orig;
                 $next_height = $height_orig;

core/lib/Thelia/Action/Message.php

@@ -68,7 +68,6 @@ class Message extends BaseAction implements EventSubscriberInterface
      */
     public function modify(MessageUpdateEvent $event)
     {
-        $search = MessageQuery::create();
 
         if (null !== $message = MessageQuery::create()->findPk($event->getMessageId())) {
 

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/Action/Order.php

@@ -334,7 +334,7 @@ class Order extends BaseAction implements EventSubscriberInterface
             // Build subject and body
             $message->build($parser, $instance);
 
-            $mail = $this->getMailer()->send($instance);
+            $this->getMailer()->send($instance);
         }
     }
 

core/lib/Thelia/Action/Product.php

@@ -378,7 +378,7 @@ class Product extends BaseAction implements EventSubscriberInterface
      */
     public function deleteFeatureProductValue(FeatureProductDeleteEvent $event)
     {
-        $featureProduct = FeatureProductQuery::create()
+        FeatureProductQuery::create()
             ->filterByProductId($event->getProductId())
             ->filterByFeatureId($event->getFeatureId())
             ->delete()

core/lib/Thelia/Action/Template.php

@@ -74,7 +74,6 @@ class Template extends BaseAction implements EventSubscriberInterface
      */
     public function update(TemplateUpdateEvent $event)
     {
-        $search = TemplateQuery::create();
 
         if (null !== $template = TemplateQuery::create()->findPk($event->getTemplateId())) {
 

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/Output/TheliaConsoleOutput.php

@@ -44,7 +44,7 @@ class TheliaConsoleOutput extends ConsoleOutput
         foreach ($messages as $message) {
             $length = ($strlen($message) > $length) ? $strlen($message) : $length;
         }
-        $ouput = array();
+        $output = array();
         foreach ($messages as $message) {
             $output[] = "<" . $style . ">" . "  " . $message . str_repeat(' ', $length - $strlen($message)) . "  </" . $style . ">";
         }

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/Command/UpdateCommand.php

@@ -56,7 +56,7 @@ class UpdateCommand extends ContainerAwareCommand
         $update = new Update();
 
         try {
-            $updatedVersions = $update->process();
+            $update->process();
 
             $output->writeln(array(
                 '',
@@ -64,8 +64,6 @@ class UpdateCommand extends ContainerAwareCommand
                 ''
             ));
         } catch (PropelException $e) {
-            $errorMsg = $e->getMessage();
-
             $output->writeln(array(
                 '',
                 sprintf('<error>Error during update process with message : %s</error>', $e->getMessage()),

core/lib/Thelia/Config/DefinePropel.php

@@ -40,7 +40,7 @@ class DefinePropel
     {
         $connection = $this->processorConfig["connection"];
 
-        return $conf = array(
+        return array(
             "dsn" => $connection["dsn"],
             "user" => $connection["user"],
             "password" => $connection["password"],

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;
     }
 
@@ -152,9 +154,6 @@ class BaseAdminController extends BaseController
          // Log the problem
          $this->adminLogAppend(implode(",", $resources), implode(",", $accesses), "User is not granted for resources %s with accesses %s", implode(", ", $resources), implode(", ", $accesses));
 
-         // Generate the proper response
-         $response = new Response();
-
          return $this->errorPage($this->getTranslator()->trans("Sorry, you're not allowed to perform this action"), 403);
     }
 

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/Controller/Admin/LangController.php

@@ -278,7 +278,6 @@ class LangController extends BaseAdminController
             $data = $form->getData();
             $event = new LangUrlEvent();
             foreach ($data as $key => $value) {
-                $pos= strpos($key, LangUrlForm::LANG_PREFIX);
                 if (false !== strpos($key, LangUrlForm::LANG_PREFIX)) {
                     $event->addUrl(substr($key,strlen(LangUrlForm::LANG_PREFIX)), $value);
                 }
@@ -316,8 +315,6 @@ class LangController extends BaseAdminController
     {
         if (null !== $response = $this->checkAuth(AdminResources::LANGUAGE, array(), AccessManager::UPDATE)) return $response;
 
-        $error_msg = false;
-
         ConfigQuery::create()
             ->filterByName('one_domain_foreach_lang')
             ->update(array('Value' => $activate));

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

@@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin;
 
 use Thelia\Form\AdminLogin;
 use Thelia\Core\Security\Authentication\AdminUsernamePasswordFormAuthenticator;
+use Thelia\Form\Exception\FormValidationException;
 use Thelia\Model\AdminLog;
 use Thelia\Core\Security\Exception\AuthenticationException;
 use Thelia\Tools\URL;
@@ -53,7 +54,7 @@ class SessionController extends BaseAdminController
                 $this->adminLogAppend("admin", "LOGIN", "Successful token authentication");
 
                 // Update the cookie
-                $cookie = $this->createAdminRememberMeCookie($user);
+                $this->createAdminRememberMeCookie($user);
 
                 // Render the home page
                 return $this->render("home");

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

@@ -38,8 +38,6 @@ class TranslationsController extends BaseAdminController
 {
     protected function renderTemplate()
     {
-        // Find modules
-        $modules = ModuleQuery::create()->joinI18n($this->getCurrentEditionLocale())->orderByPosition()->find();
 
         // Get related strings, if all input data are here
         $item_to_translate = $this->getRequest()->get('item_to_translate');

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");