diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
old mode 100755
new mode 100644
diff --git a/LICENSE.txt b/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/Readme.md b/Readme.md
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
old mode 100755
new mode 100644
index d609eedc6..d138fc8d3
--- a/composer.json
+++ b/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",
- "ptachoire/cssembed": "dev-master",
+ "leafo/lessphp": "0.4.*",
+ "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/"]
+ }
+ }
+ }
+ ]
}
diff --git a/composer.lock b/composer.lock
old mode 100755
new mode 100644
index 7dcf78eb5..b333e828c
--- a/composer.lock
+++ b/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",
- "reference": "5d44eec3b571b4a6daae45794b0a31fbbf63c74c",
+ "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/1fc1521b5e9794ea77e4eca30717be9635f1d4f4",
+ "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",
- "reference": "/tags/v3.1.14/@4752"
+ "url": "http://smarty-php.googlecode.com/svn/",
+ "reference": "tags/Smarty_3_1_14/distribution/"
},
- "require": {
- "php": ">=5.2"
+ "dist": {
+ "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",
- "distribution/libs/SmartyBC.class.php",
- "distribution/libs/sysplugins/smarty_security.php"
+ "libs/"
]
- },
- "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
},
diff --git a/core/bootstrap.php b/core/bootstrap.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Action/Attribute.php b/core/lib/Thelia/Action/Attribute.php
index 30ceea0e8..4591c2ea5 100644
--- a/core/lib/Thelia/Action/Attribute.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/AttributeAv.php b/core/lib/Thelia/Action/AttributeAv.php
index 83d85b398..f5d320f03 100644
--- a/core/lib/Thelia/Action/AttributeAv.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/BaseAction.php b/core/lib/Thelia/Action/BaseAction.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Action/Cache.php b/core/lib/Thelia/Action/Cache.php
index 4407c3e92..10a70f2f2 100644
--- a/core/lib/Thelia/Action/Cache.php
+++ b/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);
}
diff --git a/core/lib/Thelia/Action/Cart.php b/core/lib/Thelia/Action/Cart.php
old mode 100755
new mode 100644
index c1abd3034..dbaf3409b
--- a/core/lib/Thelia/Action/Cart.php
+++ b/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();
diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Action/Config.php b/core/lib/Thelia/Action/Config.php
index e925811d3..8bb1e9fbf 100644
--- a/core/lib/Thelia/Action/Config.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php
index 3fe24326a..92ce23f99 100644
--- a/core/lib/Thelia/Action/Currency.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/Customer.php b/core/lib/Thelia/Action/Customer.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Action/Feature.php b/core/lib/Thelia/Action/Feature.php
index 36853f444..e46239695 100644
--- a/core/lib/Thelia/Action/Feature.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/FeatureAv.php b/core/lib/Thelia/Action/FeatureAv.php
index c2ef4f7bc..b88c97324 100644
--- a/core/lib/Thelia/Action/FeatureAv.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/HttpException.php b/core/lib/Thelia/Action/HttpException.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Action/Image.php b/core/lib/Thelia/Action/Image.php
old mode 100755
new mode 100644
index e4e1ac8d4..e5beb2823
--- a/core/lib/Thelia/Action/Image.php
+++ b/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;
diff --git a/core/lib/Thelia/Action/Message.php b/core/lib/Thelia/Action/Message.php
index 4b85c7ca9..045769e58 100644
--- a/core/lib/Thelia/Action/Message.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Action/Module.php b/core/lib/Thelia/Action/Module.php
index 44f009af4..5ce36c459 100644
--- a/core/lib/Thelia/Action/Module.php
+++ b/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(
diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
old mode 100755
new mode 100644
index 1abe36508..fe467609b
--- a/core/lib/Thelia/Action/Order.php
+++ b/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);
}
}
diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php
index a5defe5cb..a2c24a163 100644
--- a/core/lib/Thelia/Action/Product.php
+++ b/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()
diff --git a/core/lib/Thelia/Action/Template.php b/core/lib/Thelia/Action/Template.php
index c5ea6b03e..cce146ec3 100644
--- a/core/lib/Thelia/Action/Template.php
+++ b/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())) {
diff --git a/core/lib/Thelia/Cart/CartTrait.php b/core/lib/Thelia/Cart/CartTrait.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/BaseModuleGenerate.php b/core/lib/Thelia/Command/BaseModuleGenerate.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/CacheClear.php b/core/lib/Thelia/Command/CacheClear.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/ClearImageCache.php b/core/lib/Thelia/Command/ClearImageCache.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/ContainerAwareCommand.php b/core/lib/Thelia/Command/ContainerAwareCommand.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/CreateAdminUser.php b/core/lib/Thelia/Command/CreateAdminUser.php
index 026cf42ca..7e9b59ba0 100644
--- a/core/lib/Thelia/Command/CreateAdminUser.php
+++ b/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),
diff --git a/core/lib/Thelia/Command/Install.php b/core/lib/Thelia/Command/Install.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/ModuleActivateCommand.php b/core/lib/Thelia/Command/ModuleActivateCommand.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/ModuleGenerateCommand.php b/core/lib/Thelia/Command/ModuleGenerateCommand.php
old mode 100755
new mode 100644
index acf298184..7657f1d89
--- a/core/lib/Thelia/Command/ModuleGenerateCommand.php
+++ b/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;
diff --git a/core/lib/Thelia/Command/ModuleGenerateModelCommand.php b/core/lib/Thelia/Command/ModuleGenerateModelCommand.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/ModuleGenerateSqlCommand.php b/core/lib/Thelia/Command/ModuleGenerateSqlCommand.php
old mode 100755
new mode 100644
diff --git a/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php b/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php
old mode 100755
new mode 100644
index fb53cc92e..f13ef4d9b
--- a/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php
+++ b/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 . ">";
}
diff --git a/core/lib/Thelia/Command/Skeleton/Module/Class.php b/core/lib/Thelia/Command/Skeleton/Module/Class.php
old mode 100755
new mode 100644
index 5c3335c14..41fcfadbb
--- a/core/lib/Thelia/Command/Skeleton/Module/Class.php
+++ b/core/lib/Thelia/Command/Skeleton/Module/Class.php
@@ -33,4 +33,4 @@ class %%CLASSNAME%% extends BaseModule
*
* Have fun !
*/
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Command/Skeleton/Module/config.xml b/core/lib/Thelia/Command/Skeleton/Module/config.xml
old mode 100755
new mode 100644
index 2430f5027..39341f344
--- a/core/lib/Thelia/Command/Skeleton/Module/config.xml
+++ b/core/lib/Thelia/Command/Skeleton/Module/config.xml
@@ -22,12 +22,6 @@
-->
-
-
-
-
-
-
-
-