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..0212026d2
--- a/composer.json
+++ b/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/"]
+ }
+ }
+ }
+ ]
}
diff --git a/composer.lock b/composer.lock
old mode 100755
new mode 100644
index 7dcf78eb5..41985a0f9
--- 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": "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",
- "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",
diff --git a/core/bootstrap.php b/core/bootstrap.php
old mode 100755
new mode 100644
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/Cart.php b/core/lib/Thelia/Action/Cart.php
old mode 100755
new mode 100644
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/Coupon.php b/core/lib/Thelia/Action/Coupon.php
old mode 100755
new mode 100644
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/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
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
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
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 @@
-->
-
-
-
-
-
-
-
-