diff --git a/.travis.yml b/.travis.yml old mode 100644 new mode 100755 diff --git a/Readme.md b/Readme.md index b6c0945d0..791b61d1e 100755 --- a/Readme.md +++ b/Readme.md @@ -1,8 +1,9 @@ Readme ====== -Thelia +Thelia ------ +[![Build Status](https://travis-ci.org/thelia/thelia.png?branch=master)](https://travis-ci.org/thelia/thelia) Thelia is an open source tool for creating e-business websites and managing online content. This software is published under GPL. diff --git a/Thelia b/Thelia index 2aaa3c3e5..a161b610f 100755 --- a/Thelia +++ b/Thelia @@ -7,6 +7,7 @@ require __DIR__ . '/core/bootstrap.php'; use Thelia\Core\Thelia; use Thelia\Core\Application; +use Thelia\Command\Output\TheliaConsoleOutput; use Symfony\Component\Console\Input\ArgvInput; $input = new ArgvInput(); @@ -15,4 +16,4 @@ $debug = getenv('THELIA_DEBUG') !== '0' && !$input->hasParameterOption(array('-- $thelia = new Thelia($env, $debug); $application = new Application($thelia); -$application->run($input); \ No newline at end of file +$application->run($input, new TheliaConsoleOutput()); \ No newline at end of file diff --git a/composer.json b/composer.json index 31739057b..04b020c18 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "php": ">=5.4", "ezyang/htmlpurifier": "dev-master", "ircmaxell/password-compat": "dev-master", - "propel/propel": "2.0.0-alpha1", + "propel/propel": "dev-master", "psr/log" : "1.0", "symfony/class-loader": "2.2.*", "symfony/config" : "2.2.*", diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 index 22158aa3c..0e44951da --- 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": "449a98ad751df49842394b9e47f3f447", + "hash": "af923b61425810eacdb86a41df529feb", "packages": [ { "name": "ezyang/htmlpurifier", @@ -202,30 +202,30 @@ }, { "name": "propel/propel", - "version": "2.0.0-alpha1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/propelorm/Propel2.git", - "reference": "2.0.0-alpha1" + "reference": "4cf5fca150ed93b33dc54206e3d9d943d0712621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel2/zipball/2.0.0-alpha1", - "reference": "2.0.0-alpha1", + "url": "https://api.github.com/repos/propelorm/Propel2/zipball/4cf5fca150ed93b33dc54206e3d9d943d0712621", + "reference": "4cf5fca150ed93b33dc54206e3d9d943d0712621", "shasum": "" }, "require": { "php": ">=5.4", - "psr/log": ">=1.0,<2.0", - "symfony/console": ">=2.2,<3.0", - "symfony/filesystem": ">=2.2,<3.0", - "symfony/finder": ">=2.2,<3.0", - "symfony/validator": ">=2.2,<3.0", - "symfony/yaml": ">=2.2,<3.0" + "psr/log": "~1.0", + "symfony/console": "~2.2", + "symfony/filesystem": "~2.2", + "symfony/finder": "~2.2", + "symfony/validator": "~2.2", + "symfony/yaml": "~2.2" }, "require-dev": { - "behat/behat": ">=2.4,<3.0", - "monolog/monolog": ">=1.3,<2.0", + "behat/behat": "~2.4", + "monolog/monolog": "~1.3", "phpunit/phpunit": "3.7.*" }, "suggest": { @@ -258,7 +258,7 @@ "orm", "persistence" ], - "time": "2013-06-05 06:46:14" + "time": "2013-07-10 11:32:06" }, { "name": "psr/log", @@ -1979,7 +1979,7 @@ "stability-flags": { "ezyang/htmlpurifier": 20, "ircmaxell/password-compat": 20, - "propel/propel": 15, + "propel/propel": 20, "kriswallsmith/assetic": 20, "leafo/lessphp": 20, "ptachoire/cssembed": 20, diff --git a/core/bootstrap.php b/core/bootstrap.php index fd0dd80e9..8b53e72e5 100755 --- a/core/bootstrap.php +++ b/core/bootstrap.php @@ -11,6 +11,7 @@ define('THELIA_CONF_DIR' , THELIA_LOCAL_DIR . 'config/'); define('THELIA_MODULE_DIR' , THELIA_LOCAL_DIR . 'modules/'); define('THELIA_WEB_DIR' , THELIA_ROOT . '/web/'); define('THELIA_TEMPLATE_DIR' , THELIA_ROOT . '/templates/'); +define('DS', DIRECTORY_SEPARATOR); $loader = require __DIR__ . "/vendor/autoload.php"; diff --git a/core/lib/Thelia/Admin/Controller/SessionController.php b/core/lib/Thelia/Admin/Controller/SessionController.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Command/BaseModuleGenerate.php b/core/lib/Thelia/Command/BaseModuleGenerate.php new file mode 100644 index 000000000..420563c40 --- /dev/null +++ b/core/lib/Thelia/Command/BaseModuleGenerate.php @@ -0,0 +1,58 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Command; + +use Propel\Runtime\Propel; +use Symfony\Component\Console\Application; + + +abstract class BaseModuleGenerate extends ContainerAwareCommand { + + protected $module; + protected $moduleDirectory; + + protected $reservedKeyWords = array( + "thelia" + ); + + protected $neededDirectories = array( + "Config", + "Model", + "Loop" + ); + + protected function verifyExistingModule() + { + if (file_exists($this->moduleDirectory)) { + throw new \RuntimeException(sprintf("%s module already exists", $this->module)); + } + } + + protected function formatModuleName($name) + { + if (in_array(strtolower($name), $this->reservedKeyWords)) { + throw new \RuntimeException(sprintf("%s module name is a reserved keyword", $name)); + } + return ucfirst($name); + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Command/ModuleGenerateCommand.php b/core/lib/Thelia/Command/ModuleGenerateCommand.php new file mode 100644 index 000000000..0f456ea63 --- /dev/null +++ b/core/lib/Thelia/Command/ModuleGenerateCommand.php @@ -0,0 +1,104 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Command; + + +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Filesystem\Filesystem; + +class ModuleGenerateCommand extends BaseModuleGenerate { + + + + protected function configure() + { + $this + ->setName("module:generate") + ->setDescription("generate all needed files for creating a new Module") + ->addArgument( + "name" , + InputArgument::REQUIRED, + "name wanted for your Module" + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $this->module = $this->formatModuleName($input->getArgument("name")); + $this->moduleDirectory = THELIA_MODULE_DIR . DIRECTORY_SEPARATOR . $this->module; + $this->verifyExistingModule(); + + $this->createDirectories(); + $this->createFiles(); + if(method_exists($this, "renderBlock")) { + //impossible to change output class in CommandTester... + $output->renderBlock(array( + '', + sprintf("module %s create with success", $this->module), + "You can now configure your module and complete plugin.xml file", + '' + ), "bg=green;fg=black"); + } + + } + + private function createDirectories() + { + $fs = new Filesystem(); + + $fs->mkdir($this->moduleDirectory); + + foreach ($this->neededDirectories as $directory) { + $fs->mkdir($this->moduleDirectory . DIRECTORY_SEPARATOR . $directory); + } + + } + + private function createFiles() + { + $fs = new Filesystem(); + $skeletonDir = str_replace("/", DIRECTORY_SEPARATOR, THELIA_ROOT . "/core/lib/Thelia/Command/Skeleton/Module/"); + $fs->copy($skeletonDir . "config.xml", $this->moduleDirectory . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.xml"); + $fs->copy($skeletonDir . "plugin.xml", $this->moduleDirectory . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "plugin.xml"); + + $classContent = file_get_contents($skeletonDir . "Class.php"); + + $classContent = str_replace("%%CLASSNAME%%", $this->module, $classContent); + $classContent = str_replace("%%NAMESPACE%%", $this->module, $classContent); + + file_put_contents($this->moduleDirectory . DIRECTORY_SEPARATOR . $this->module.".php", $classContent); + + $schemaContent = file_get_contents($skeletonDir . "schema.xml"); + + $schemaContent = str_replace("%%CONFIG_DIR%%", THELIA_CONF_DIR, $schemaContent); + $schemaContent = str_replace("%%NAMESPACE%%", $this->module, $schemaContent); + + file_put_contents($this->moduleDirectory . DIRECTORY_SEPARATOR . "Config". DIRECTORY_SEPARATOR . "schema.xml", $schemaContent); + } + + + +} \ No newline at end of file diff --git a/core/lib/Thelia/Command/ModuleGenerateModelCommand.php b/core/lib/Thelia/Command/ModuleGenerateModelCommand.php new file mode 100644 index 000000000..348765ced --- /dev/null +++ b/core/lib/Thelia/Command/ModuleGenerateModelCommand.php @@ -0,0 +1,130 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Command; + + +use Propel\Generator\Command\ModelBuildCommand; +use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Output\StreamOutput; +use Symfony\Component\Filesystem\Filesystem; + +class ModuleGenerateModelCommand extends BaseModuleGenerate { + + protected function configure() + { + $this + ->setName("module:generate:model") + ->setDescription("generate model for a specific module") + ->addArgument( + "name", + InputArgument::REQUIRED, + "module name" + ) + ->addOption( + "generate-sql", + null, + InputOption::VALUE_NONE, + "with this option generate sql file at the same time" + ) + ; + + } + + public function execute(InputInterface $input, OutputInterface $output) + { + $this->module = $this->formatModuleName($input->getArgument("name")); + $this->moduleDirectory = THELIA_MODULE_DIR . DS . $this->module; + + $fs = new Filesystem(); + + if ($fs->exists($this->moduleDirectory) === false) { + throw new \RuntimeException(sprintf("%s module does not exists", $this->module)); + } + + if ($fs->exists($this->moduleDirectory . DS . "Config" . DS . "schema.xml") === false) { + throw new \RuntimeException("schema.xml not found in Config directory. Needed file for generating model"); + } + + $this->generateModel($output); + + $output->renderBlock(array( + '', + 'Model generated successfuly', + '' + ), 'bg=green;fg=black'); + + if ($input->getOption("generate-sql")) { + $output->writeln(' '); + $this->generateSql($output); + } + } + + protected function generateSql(OutputInterface $output) + { + + $command = $this->getApplication()->find("module:generate:sql"); + + $command->run( + new ArrayInput(array( + "command" => $command->getName(), + "name" => $this->module + )), + $output + ); + } + + protected function generateModel(OutputInterface $output) + { + $fs = new Filesystem(); + $moduleBuildPropel = new ModelBuildCommand(); + $moduleBuildPropel->setApplication($this->getApplication()); + + $moduleBuildPropel->run( + new ArrayInput(array( + "command" => $moduleBuildPropel->getName(), + "--output-dir" => THELIA_MODULE_DIR, + "--input-dir" => $this->moduleDirectory . DS ."Config" + )), + $output + ); + + $verifyDirectories = array( + THELIA_MODULE_DIR . DS . "Thelia", + $this->moduleDirectory . DS . "Model" . DS . "Thelia" + ); + + foreach ($verifyDirectories as $directory) { + if ($fs->exists($directory)) { + $fs->remove($directory); + } + } + + + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Command/ModuleGenerateSqlCommand.php b/core/lib/Thelia/Command/ModuleGenerateSqlCommand.php new file mode 100644 index 000000000..977075902 --- /dev/null +++ b/core/lib/Thelia/Command/ModuleGenerateSqlCommand.php @@ -0,0 +1,85 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Command; + + +use Propel\Generator\Command\SqlBuildCommand; +use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Output\StreamOutput; +use Symfony\Component\Filesystem\Filesystem; + +class ModuleGenerateSqlCommand extends BaseModuleGenerate { + + public function configure() + { + $this + ->setName("module:generate:sql") + ->setDescription("Generate the sql from schema.xml file") + ->addArgument( + "name", + InputArgument::REQUIRED, + "Module name" + ) + ; + } + + public function execute(InputInterface $input, OutputInterface $output) + { + $this->module = $this->formatModuleName($input->getArgument("name")); + $this->moduleDirectory = THELIA_MODULE_DIR . DS . $this->module; + + $fs = new Filesystem(); + + if ($fs->exists($this->moduleDirectory) === false) { + throw new \RuntimeException(sprintf("%s module does not exists", $this->module)); + } + + if ($fs->exists($this->moduleDirectory . DS . "Config" . DS . "schema.xml") === false) { + throw new \RuntimeException("schema.xml not found in Config directory. Needed file for generating model"); + } + + $sqlBuild = new SqlBuildCommand(); + $sqlBuild->setApplication($this->getApplication()); + + $sqlBuild->run( + new ArrayInput(array( + "command" => $sqlBuild->getName(), + "--output-dir" => $this->moduleDirectory . DS ."Config", + "--input-dir" => $this->moduleDirectory . DS ."Config" + )), + $output + ); + + $output->renderBlock(array( + '', + 'Sql generated successfuly', + 'File available in your module config directory', + '' + ), 'bg=green;fg=black'); + + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php b/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php new file mode 100644 index 000000000..aa0a8a1e7 --- /dev/null +++ b/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php @@ -0,0 +1,56 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Command\Output; + + +use Symfony\Component\Console\Output\ConsoleOutput; + +class TheliaConsoleOutput extends ConsoleOutput{ + + public function renderBlock(array $messages, $style = "info") + { + $strlen = function ($string) { + if (!function_exists('mb_strlen')) { + return strlen($string); + } + + if (false === $encoding = mb_detect_encoding($string)) { + return strlen($string); + } + + return mb_strlen($string, $encoding); + }; + $length = 0; + foreach ($messages as $message) { + $length = ($strlen($message) > $length) ? $strlen($message) : $length; + } + $ouput = array(); + foreach ($messages as $message) { + $output[] = "<" . $style . ">" . " " . $message . str_repeat(' ', $length - $strlen($message)) . " "; + } + + $this->writeln($output); + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Command/Skeleton/Module/Class.php b/core/lib/Thelia/Command/Skeleton/Module/Class.php new file mode 100644 index 000000000..ccf061a48 --- /dev/null +++ b/core/lib/Thelia/Command/Skeleton/Module/Class.php @@ -0,0 +1,36 @@ +. */ +/* */ +/*************************************************************************************/ + + +namespace %%NAMESPACE%%; + +use Thelia\Module\BaseModule; + +class %%CLASSNAME%% extends BaseModule +{ + /** + * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class + * Like install and destroy + */ + +} diff --git a/core/lib/Thelia/Command/Skeleton/Module/config.xml b/core/lib/Thelia/Command/Skeleton/Module/config.xml new file mode 100644 index 000000000..2430f5027 --- /dev/null +++ b/core/lib/Thelia/Command/Skeleton/Module/config.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/lib/Thelia/Command/Skeleton/Module/plugin.xml b/core/lib/Thelia/Command/Skeleton/Module/plugin.xml new file mode 100644 index 000000000..e69de29bb diff --git a/core/lib/Thelia/Command/Skeleton/Module/schema.xml b/core/lib/Thelia/Command/Skeleton/Module/schema.xml new file mode 100644 index 000000000..3fcba0184 --- /dev/null +++ b/core/lib/Thelia/Command/Skeleton/Module/schema.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 2ae1a668b..ce63ace02 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -34,6 +34,9 @@ + + + diff --git a/core/lib/Thelia/Core/Event/CustomRefEvent.php b/core/lib/Thelia/Core/Event/CustomRefEvent.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/HttpFoundation/Request.php b/core/lib/Thelia/Core/HttpFoundation/Request.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/Role/Role.php b/core/lib/Thelia/Core/Security/Role/Role.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/Role/RoleInterface.php b/core/lib/Thelia/Core/Security/Role/RoleInterface.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/SecurityContext.php b/core/lib/Thelia/Core/Security/SecurityContext.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/User/UserInterface.php b/core/lib/Thelia/Core/Security/User/UserInterface.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php b/core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php b/core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Security/UserProvider/UserProviderInterface.php b/core/lib/Thelia/Core/Security/UserProvider/UserProviderInterface.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Template/Exception/ResourceNotFoundException.php b/core/lib/Thelia/Core/Template/Exception/ResourceNotFoundException.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Template/Loop/Auth.php b/core/lib/Thelia/Core/Template/Loop/Auth.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Template/Loop/Feed.php b/core/lib/Thelia/Core/Template/Loop/Feed.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaSyntax.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaSyntax.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Form/AdminLogin.php b/core/lib/Thelia/Form/AdminLogin.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Form/BaseForm.php b/core/lib/Thelia/Form/BaseForm.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Form/CustomerModification.php b/core/lib/Thelia/Form/CustomerModification.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Accessory.php b/core/lib/Thelia/Model/Accessory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AccessoryQuery.php b/core/lib/Thelia/Model/AccessoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Address.php b/core/lib/Thelia/Model/Address.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AddressQuery.php b/core/lib/Thelia/Model/AddressQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Admin.php b/core/lib/Thelia/Model/Admin.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AdminGroup.php b/core/lib/Thelia/Model/AdminGroup.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AdminGroupQuery.php b/core/lib/Thelia/Model/AdminGroupQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AdminLog.php b/core/lib/Thelia/Model/AdminLog.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AdminLogQuery.php b/core/lib/Thelia/Model/AdminLogQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AdminQuery.php b/core/lib/Thelia/Model/AdminQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Area.php b/core/lib/Thelia/Model/Area.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AreaQuery.php b/core/lib/Thelia/Model/AreaQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Attribute.php b/core/lib/Thelia/Model/Attribute.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeAv.php b/core/lib/Thelia/Model/AttributeAv.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeAvI18n.php b/core/lib/Thelia/Model/AttributeAvI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeAvI18nQuery.php b/core/lib/Thelia/Model/AttributeAvI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeAvQuery.php b/core/lib/Thelia/Model/AttributeAvQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeCategory.php b/core/lib/Thelia/Model/AttributeCategory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeCategoryQuery.php b/core/lib/Thelia/Model/AttributeCategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeCombination.php b/core/lib/Thelia/Model/AttributeCombination.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeCombinationQuery.php b/core/lib/Thelia/Model/AttributeCombinationQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeI18n.php b/core/lib/Thelia/Model/AttributeI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeI18nQuery.php b/core/lib/Thelia/Model/AttributeI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/AttributeQuery.php b/core/lib/Thelia/Model/AttributeQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AccessoryQuery.php b/core/lib/Thelia/Model/Base/AccessoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Address.php b/core/lib/Thelia/Model/Base/Address.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AddressQuery.php b/core/lib/Thelia/Model/Base/AddressQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AdminGroup.php b/core/lib/Thelia/Model/Base/AdminGroup.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AdminGroupQuery.php b/core/lib/Thelia/Model/Base/AdminGroupQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AdminLog.php b/core/lib/Thelia/Model/Base/AdminLog.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AdminLogQuery.php b/core/lib/Thelia/Model/Base/AdminLogQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AdminQuery.php b/core/lib/Thelia/Model/Base/AdminQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Area.php b/core/lib/Thelia/Model/Base/Area.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AreaQuery.php b/core/lib/Thelia/Model/Base/AreaQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeAvQuery.php b/core/lib/Thelia/Model/Base/AttributeAvQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeCategory.php b/core/lib/Thelia/Model/Base/AttributeCategory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php b/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/AttributeQuery.php b/core/lib/Thelia/Model/Base/AttributeQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CategoryI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CategoryVersion.php b/core/lib/Thelia/Model/Base/CategoryVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CategoryVersionQuery.php b/core/lib/Thelia/Model/Base/CategoryVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Combination.php b/core/lib/Thelia/Model/Base/Combination.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CombinationQuery.php b/core/lib/Thelia/Model/Base/CombinationQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ConfigI18nQuery.php b/core/lib/Thelia/Model/Base/ConfigI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ConfigQuery.php b/core/lib/Thelia/Model/Base/ConfigQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentAssoc.php b/core/lib/Thelia/Model/Base/ContentAssoc.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentAssocQuery.php b/core/lib/Thelia/Model/Base/ContentAssocQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentFolderQuery.php b/core/lib/Thelia/Model/Base/ContentFolderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentVersion.php b/core/lib/Thelia/Model/Base/ContentVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ContentVersionQuery.php b/core/lib/Thelia/Model/Base/ContentVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CountryI18nQuery.php b/core/lib/Thelia/Model/Base/CountryI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CouponOrderQuery.php b/core/lib/Thelia/Model/Base/CouponOrderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CouponRule.php b/core/lib/Thelia/Model/Base/CouponRule.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CouponRuleQuery.php b/core/lib/Thelia/Model/Base/CouponRuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Customer.php b/core/lib/Thelia/Model/Base/Customer.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CustomerQuery.php b/core/lib/Thelia/Model/Base/CustomerQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Delivzone.php b/core/lib/Thelia/Model/Base/Delivzone.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/DelivzoneQuery.php b/core/lib/Thelia/Model/Base/DelivzoneQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Document.php b/core/lib/Thelia/Model/Base/Document.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/DocumentI18n.php b/core/lib/Thelia/Model/Base/DocumentI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/DocumentI18nQuery.php b/core/lib/Thelia/Model/Base/DocumentI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/DocumentQuery.php b/core/lib/Thelia/Model/Base/DocumentQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureAvQuery.php b/core/lib/Thelia/Model/Base/FeatureAvQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureCategory.php b/core/lib/Thelia/Model/Base/FeatureCategory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php b/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureProd.php b/core/lib/Thelia/Model/Base/FeatureProd.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureProdQuery.php b/core/lib/Thelia/Model/Base/FeatureProdQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FeatureQuery.php b/core/lib/Thelia/Model/Base/FeatureQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FolderI18nQuery.php b/core/lib/Thelia/Model/Base/FolderI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FolderVersion.php b/core/lib/Thelia/Model/Base/FolderVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/FolderVersionQuery.php b/core/lib/Thelia/Model/Base/FolderVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupI18nQuery.php b/core/lib/Thelia/Model/Base/GroupI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupModule.php b/core/lib/Thelia/Model/Base/GroupModule.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupModuleQuery.php b/core/lib/Thelia/Model/Base/GroupModuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupQuery.php b/core/lib/Thelia/Model/Base/GroupQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupResource.php b/core/lib/Thelia/Model/Base/GroupResource.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/GroupResourceQuery.php b/core/lib/Thelia/Model/Base/GroupResourceQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Image.php b/core/lib/Thelia/Model/Base/Image.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ImageI18n.php b/core/lib/Thelia/Model/Base/ImageI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ImageI18nQuery.php b/core/lib/Thelia/Model/Base/ImageI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ImageQuery.php b/core/lib/Thelia/Model/Base/ImageQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Lang.php b/core/lib/Thelia/Model/Base/Lang.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/LangQuery.php b/core/lib/Thelia/Model/Base/LangQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/MessageI18nQuery.php b/core/lib/Thelia/Model/Base/MessageI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/MessageVersionQuery.php b/core/lib/Thelia/Model/Base/MessageVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ModuleI18nQuery.php b/core/lib/Thelia/Model/Base/ModuleI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderAddress.php b/core/lib/Thelia/Model/Base/OrderAddress.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderAddressQuery.php b/core/lib/Thelia/Model/Base/OrderAddressQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderFeature.php b/core/lib/Thelia/Model/Base/OrderFeature.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderFeatureQuery.php b/core/lib/Thelia/Model/Base/OrderFeatureQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderQuery.php b/core/lib/Thelia/Model/Base/OrderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php b/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductI18nQuery.php b/core/lib/Thelia/Model/Base/ProductI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ProductVersionQuery.php b/core/lib/Thelia/Model/Base/ProductVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ResourceI18nQuery.php b/core/lib/Thelia/Model/Base/ResourceI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Rewriting.php b/core/lib/Thelia/Model/Base/Rewriting.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/RewritingQuery.php b/core/lib/Thelia/Model/Base/RewritingQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Stock.php b/core/lib/Thelia/Model/Base/Stock.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/StockQuery.php b/core/lib/Thelia/Model/Base/StockQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxI18nQuery.php b/core/lib/Thelia/Model/Base/TaxI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CategoryI18n.php b/core/lib/Thelia/Model/CategoryI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CategoryI18nQuery.php b/core/lib/Thelia/Model/CategoryI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CategoryQuery.php b/core/lib/Thelia/Model/CategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CategoryVersion.php b/core/lib/Thelia/Model/CategoryVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CategoryVersionQuery.php b/core/lib/Thelia/Model/CategoryVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Combination.php b/core/lib/Thelia/Model/Combination.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CombinationQuery.php b/core/lib/Thelia/Model/CombinationQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Config.php b/core/lib/Thelia/Model/Config.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ConfigI18n.php b/core/lib/Thelia/Model/ConfigI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ConfigI18nQuery.php b/core/lib/Thelia/Model/ConfigI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentAssoc.php b/core/lib/Thelia/Model/ContentAssoc.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentAssocQuery.php b/core/lib/Thelia/Model/ContentAssocQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentFolder.php b/core/lib/Thelia/Model/ContentFolder.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentFolderQuery.php b/core/lib/Thelia/Model/ContentFolderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentI18n.php b/core/lib/Thelia/Model/ContentI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentI18nQuery.php b/core/lib/Thelia/Model/ContentI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentQuery.php b/core/lib/Thelia/Model/ContentQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentVersion.php b/core/lib/Thelia/Model/ContentVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ContentVersionQuery.php b/core/lib/Thelia/Model/ContentVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Country.php b/core/lib/Thelia/Model/Country.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CountryI18n.php b/core/lib/Thelia/Model/CountryI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CountryI18nQuery.php b/core/lib/Thelia/Model/CountryI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CountryQuery.php b/core/lib/Thelia/Model/CountryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CouponOrder.php b/core/lib/Thelia/Model/CouponOrder.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CouponOrderQuery.php b/core/lib/Thelia/Model/CouponOrderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CouponQuery.php b/core/lib/Thelia/Model/CouponQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CouponRule.php b/core/lib/Thelia/Model/CouponRule.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CouponRuleQuery.php b/core/lib/Thelia/Model/CouponRuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Currency.php b/core/lib/Thelia/Model/Currency.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CurrencyQuery.php b/core/lib/Thelia/Model/CurrencyQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CustomerQuery.php b/core/lib/Thelia/Model/CustomerQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CustomerTitle.php b/core/lib/Thelia/Model/CustomerTitle.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CustomerTitleI18n.php b/core/lib/Thelia/Model/CustomerTitleI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CustomerTitleI18nQuery.php b/core/lib/Thelia/Model/CustomerTitleI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/CustomerTitleQuery.php b/core/lib/Thelia/Model/CustomerTitleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Delivzone.php b/core/lib/Thelia/Model/Delivzone.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/DelivzoneQuery.php b/core/lib/Thelia/Model/DelivzoneQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Document.php b/core/lib/Thelia/Model/Document.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/DocumentI18n.php b/core/lib/Thelia/Model/DocumentI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/DocumentI18nQuery.php b/core/lib/Thelia/Model/DocumentI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/DocumentQuery.php b/core/lib/Thelia/Model/DocumentQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Feature.php b/core/lib/Thelia/Model/Feature.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureAv.php b/core/lib/Thelia/Model/FeatureAv.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureAvI18n.php b/core/lib/Thelia/Model/FeatureAvI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureAvI18nQuery.php b/core/lib/Thelia/Model/FeatureAvI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureAvQuery.php b/core/lib/Thelia/Model/FeatureAvQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureCategory.php b/core/lib/Thelia/Model/FeatureCategory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureCategoryQuery.php b/core/lib/Thelia/Model/FeatureCategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureI18n.php b/core/lib/Thelia/Model/FeatureI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureI18nQuery.php b/core/lib/Thelia/Model/FeatureI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureProd.php b/core/lib/Thelia/Model/FeatureProd.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureProdQuery.php b/core/lib/Thelia/Model/FeatureProdQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FeatureQuery.php b/core/lib/Thelia/Model/FeatureQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FolderI18n.php b/core/lib/Thelia/Model/FolderI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FolderI18nQuery.php b/core/lib/Thelia/Model/FolderI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FolderQuery.php b/core/lib/Thelia/Model/FolderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FolderVersion.php b/core/lib/Thelia/Model/FolderVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/FolderVersionQuery.php b/core/lib/Thelia/Model/FolderVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Group.php b/core/lib/Thelia/Model/Group.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupI18n.php b/core/lib/Thelia/Model/GroupI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupI18nQuery.php b/core/lib/Thelia/Model/GroupI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupModule.php b/core/lib/Thelia/Model/GroupModule.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupModuleQuery.php b/core/lib/Thelia/Model/GroupModuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupQuery.php b/core/lib/Thelia/Model/GroupQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupResource.php b/core/lib/Thelia/Model/GroupResource.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/GroupResourceQuery.php b/core/lib/Thelia/Model/GroupResourceQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Image.php b/core/lib/Thelia/Model/Image.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ImageI18n.php b/core/lib/Thelia/Model/ImageI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ImageI18nQuery.php b/core/lib/Thelia/Model/ImageI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ImageQuery.php b/core/lib/Thelia/Model/ImageQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Lang.php b/core/lib/Thelia/Model/Lang.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/LangQuery.php b/core/lib/Thelia/Model/LangQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AccessoryTableMap.php b/core/lib/Thelia/Model/Map/AccessoryTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AddressTableMap.php b/core/lib/Thelia/Model/Map/AddressTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AdminGroupTableMap.php b/core/lib/Thelia/Model/Map/AdminGroupTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AdminLogTableMap.php b/core/lib/Thelia/Model/Map/AdminLogTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AdminTableMap.php b/core/lib/Thelia/Model/Map/AdminTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AreaTableMap.php b/core/lib/Thelia/Model/Map/AreaTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php old mode 100644 new mode 100755 index 14fc79eeb..02a20540e --- a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php @@ -151,7 +151,7 @@ class AttributeAvI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute_av', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php old mode 100644 new mode 100755 index 138f0fa9c..0c5c2e1c9 --- a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php @@ -106,7 +106,7 @@ class AttributeAvTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php b/core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php old mode 100644 new mode 100755 index b60cae5b8..8471d3e26 --- a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php @@ -151,7 +151,7 @@ class AttributeI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php old mode 100644 new mode 100755 index dca811cbc..773e13cab --- a/core/lib/Thelia/Model/Map/AttributeTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeTableMap.php @@ -101,7 +101,7 @@ class AttributeTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php old mode 100644 new mode 100755 index 1611b2ebf..8c52aa7b2 --- a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php old mode 100644 new mode 100755 index 83010e4fa..a301a5efe --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -131,7 +131,7 @@ class CategoryTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php b/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CombinationTableMap.php b/core/lib/Thelia/Model/Map/CombinationTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php old mode 100644 new mode 100755 index a83f87b76..b953b0ac9 --- a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php @@ -151,7 +151,7 @@ class ConfigI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'config', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php old mode 100644 new mode 100755 index 8bd68a964..ebd5d6edf --- a/core/lib/Thelia/Model/Map/ConfigTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php @@ -116,7 +116,7 @@ class ConfigTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentAssocTableMap.php b/core/lib/Thelia/Model/Map/ContentAssocTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php old mode 100644 new mode 100755 index ee9122a6c..f718623b0 --- a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php @@ -151,7 +151,7 @@ class ContentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php old mode 100644 new mode 100755 index 60b04ae36..b794c7244 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -121,7 +121,7 @@ class ContentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentVersionTableMap.php b/core/lib/Thelia/Model/Map/ContentVersionTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php old mode 100644 new mode 100755 index cc60b09d2..272231464 --- a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php @@ -151,7 +151,7 @@ class CountryI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'country', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php old mode 100644 new mode 100755 index c4b96c8bd..3060da70f --- a/core/lib/Thelia/Model/Map/CountryTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryTableMap.php @@ -116,7 +116,7 @@ class CountryTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CouponRuleTableMap.php b/core/lib/Thelia/Model/Map/CouponRuleTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CustomerTableMap.php b/core/lib/Thelia/Model/Map/CustomerTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php old mode 100644 new mode 100755 index d403756fa..5344099c5 --- a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php @@ -141,7 +141,7 @@ class CustomerTitleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'customer_title', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('SHORT', 'Short', 'VARCHAR', false, 10, null); $this->addColumn('LONG', 'Long', 'VARCHAR', false, 45, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php old mode 100644 new mode 100755 index a392ee4dd..8e91631cf --- a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php @@ -106,7 +106,7 @@ class CustomerTitleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/DelivzoneTableMap.php b/core/lib/Thelia/Model/Map/DelivzoneTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php old mode 100644 new mode 100755 index d0356e8c6..70314ea02 --- a/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php @@ -151,7 +151,7 @@ class DocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/DocumentTableMap.php b/core/lib/Thelia/Model/Map/DocumentTableMap.php old mode 100644 new mode 100755 index 50bb37b95..d53263a06 --- a/core/lib/Thelia/Model/Map/DocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/DocumentTableMap.php @@ -126,7 +126,7 @@ class DocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php old mode 100644 new mode 100755 index b3114e7ba..ba592b4b0 --- a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php @@ -151,7 +151,7 @@ class FeatureAvI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature_av', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php old mode 100644 new mode 100755 index f447f8dc5..972a25744 --- a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php @@ -101,7 +101,7 @@ class FeatureAvTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php b/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php old mode 100644 new mode 100755 index af0dfc263..dba05fb67 --- a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php @@ -151,7 +151,7 @@ class FeatureI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FeatureProdTableMap.php b/core/lib/Thelia/Model/Map/FeatureProdTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php old mode 100644 new mode 100755 index 8d851559e..b1f309603 --- a/core/lib/Thelia/Model/Map/FeatureTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureTableMap.php @@ -106,7 +106,7 @@ class FeatureTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php old mode 100644 new mode 100755 index fc85b17ec..d10344811 --- a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php @@ -151,7 +151,7 @@ class FolderI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php old mode 100644 new mode 100755 index 794e3691c..c26e23dc8 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -131,7 +131,7 @@ class FolderTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderVersionTableMap.php b/core/lib/Thelia/Model/Map/FolderVersionTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php old mode 100644 new mode 100755 index 585127821..57788593a --- a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php @@ -151,7 +151,7 @@ class GroupI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/GroupModuleTableMap.php b/core/lib/Thelia/Model/Map/GroupModuleTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/GroupResourceTableMap.php b/core/lib/Thelia/Model/Map/GroupResourceTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php old mode 100644 new mode 100755 index a8c830005..881a2fa84 --- a/core/lib/Thelia/Model/Map/GroupTableMap.php +++ b/core/lib/Thelia/Model/Map/GroupTableMap.php @@ -101,7 +101,7 @@ class GroupTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ImageI18nTableMap.php old mode 100644 new mode 100755 index 4f3b197a6..a78e7667c --- a/core/lib/Thelia/Model/Map/ImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ImageI18nTableMap.php @@ -151,7 +151,7 @@ class ImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ImageTableMap.php b/core/lib/Thelia/Model/Map/ImageTableMap.php old mode 100644 new mode 100755 index 0f8d82b20..c49f24527 --- a/core/lib/Thelia/Model/Map/ImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ImageTableMap.php @@ -126,7 +126,7 @@ class ImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/LangTableMap.php b/core/lib/Thelia/Model/Map/LangTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php old mode 100644 new mode 100755 index f084515c0..bb9bfdd2e --- a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php @@ -146,7 +146,7 @@ class MessageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'LONGVARCHAR', false, null, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('DESCRIPTION_HTML', 'DescriptionHtml', 'CLOB', false, null, null); diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php old mode 100644 new mode 100755 index de2a205f9..392dac824 --- a/core/lib/Thelia/Model/Map/MessageTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageTableMap.php @@ -126,7 +126,7 @@ class MessageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php old mode 100644 new mode 100755 index 67b7a34ef..a8e680f1c --- a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php @@ -151,7 +151,7 @@ class ModuleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'module', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php old mode 100644 new mode 100755 index 5370c1da1..cccaa890a --- a/core/lib/Thelia/Model/Map/ModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php @@ -116,7 +116,7 @@ class ModuleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/OrderAddressTableMap.php b/core/lib/Thelia/Model/Map/OrderAddressTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/OrderFeatureTableMap.php b/core/lib/Thelia/Model/Map/OrderFeatureTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php old mode 100644 new mode 100755 index 5d78c474c..1b2052c2e --- a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php @@ -151,7 +151,7 @@ class OrderStatusI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'order_status', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php old mode 100644 new mode 100755 index eecfe5a03..18406d9aa --- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php @@ -101,7 +101,7 @@ class OrderStatusTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/OrderTableMap.php b/core/lib/Thelia/Model/Map/OrderTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php old mode 100644 new mode 100755 index 8da33f15d..79a01514a --- a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php @@ -151,7 +151,7 @@ class ProductI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php old mode 100644 new mode 100755 index b009a97af..40200ce10 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -166,7 +166,7 @@ class ProductTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php old mode 100644 new mode 100755 index 8a8ce501a..ec22e2fd3 --- a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php @@ -151,7 +151,7 @@ class ResourceI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'resource', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php old mode 100644 new mode 100755 index e56960892..8d7708ddd --- a/core/lib/Thelia/Model/Map/ResourceTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceTableMap.php @@ -101,7 +101,7 @@ class ResourceTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/RewritingTableMap.php b/core/lib/Thelia/Model/Map/RewritingTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/StockTableMap.php b/core/lib/Thelia/Model/Map/StockTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php old mode 100644 new mode 100755 index 2c4c92f4f..a06230c37 --- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php @@ -141,7 +141,7 @@ class TaxI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php old mode 100644 new mode 100755 index 689f30728..1f0ed1e96 --- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php @@ -131,7 +131,7 @@ class TaxRuleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); } // initialize() /** diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php old mode 100644 new mode 100755 index 9b862de99..cc5f628b9 --- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php @@ -111,7 +111,7 @@ class TaxRuleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php old mode 100644 new mode 100755 index b941e7b52..6d43f20e9 --- a/core/lib/Thelia/Model/Map/TaxTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxTableMap.php @@ -101,7 +101,7 @@ class TaxTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_EN'; + const DEFAULT_LOCALE = 'en_US'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Message.php b/core/lib/Thelia/Model/Message.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/MessageI18n.php b/core/lib/Thelia/Model/MessageI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/MessageI18nQuery.php b/core/lib/Thelia/Model/MessageI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/MessageQuery.php b/core/lib/Thelia/Model/MessageQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/MessageVersion.php b/core/lib/Thelia/Model/MessageVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/MessageVersionQuery.php b/core/lib/Thelia/Model/MessageVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Module.php b/core/lib/Thelia/Model/Module.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ModuleI18n.php b/core/lib/Thelia/Model/ModuleI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ModuleI18nQuery.php b/core/lib/Thelia/Model/ModuleI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ModuleQuery.php b/core/lib/Thelia/Model/ModuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderAddress.php b/core/lib/Thelia/Model/OrderAddress.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderAddressQuery.php b/core/lib/Thelia/Model/OrderAddressQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderFeature.php b/core/lib/Thelia/Model/OrderFeature.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderFeatureQuery.php b/core/lib/Thelia/Model/OrderFeatureQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderProduct.php b/core/lib/Thelia/Model/OrderProduct.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderProductQuery.php b/core/lib/Thelia/Model/OrderProductQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderQuery.php b/core/lib/Thelia/Model/OrderQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderStatus.php b/core/lib/Thelia/Model/OrderStatus.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderStatusI18n.php b/core/lib/Thelia/Model/OrderStatusI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderStatusI18nQuery.php b/core/lib/Thelia/Model/OrderStatusI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/OrderStatusQuery.php b/core/lib/Thelia/Model/OrderStatusQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductCategory.php b/core/lib/Thelia/Model/ProductCategory.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductCategoryQuery.php b/core/lib/Thelia/Model/ProductCategoryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductI18n.php b/core/lib/Thelia/Model/ProductI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductI18nQuery.php b/core/lib/Thelia/Model/ProductI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductQuery.php b/core/lib/Thelia/Model/ProductQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductVersion.php b/core/lib/Thelia/Model/ProductVersion.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ProductVersionQuery.php b/core/lib/Thelia/Model/ProductVersionQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Resource.php b/core/lib/Thelia/Model/Resource.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ResourceI18n.php b/core/lib/Thelia/Model/ResourceI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ResourceI18nQuery.php b/core/lib/Thelia/Model/ResourceI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/ResourceQuery.php b/core/lib/Thelia/Model/ResourceQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/RewritingQuery.php b/core/lib/Thelia/Model/RewritingQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Stock.php b/core/lib/Thelia/Model/Stock.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/StockQuery.php b/core/lib/Thelia/Model/StockQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxI18n.php b/core/lib/Thelia/Model/TaxI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxI18nQuery.php b/core/lib/Thelia/Model/TaxI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxQuery.php b/core/lib/Thelia/Model/TaxQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxRule.php b/core/lib/Thelia/Model/TaxRule.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxRuleCountry.php b/core/lib/Thelia/Model/TaxRuleCountry.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/TaxRuleCountryQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxRuleI18n.php b/core/lib/Thelia/Model/TaxRuleI18n.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/TaxRuleI18nQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php new file mode 100644 index 000000000..14777d331 --- /dev/null +++ b/core/lib/Thelia/Module/BaseModule.php @@ -0,0 +1,43 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Module; + +abstract class BaseModule +{ + + public function __construct() + { + + } + + protected function activate() + { + + } + + abstract public function install(); + abstract public function destroy(); + +} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Command/BaseCommandTest.php b/core/lib/Thelia/Tests/Command/BaseCommandTest.php new file mode 100644 index 000000000..ca9d0a632 --- /dev/null +++ b/core/lib/Thelia/Tests/Command/BaseCommandTest.php @@ -0,0 +1,20 @@ +getMock("Symfony\Component\HttpKernel\KernelInterface"); + + return $kernel; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Command/ModuleGenerateCommandTest.php b/core/lib/Thelia/Tests/Command/ModuleGenerateCommandTest.php new file mode 100644 index 000000000..dcbc98fff --- /dev/null +++ b/core/lib/Thelia/Tests/Command/ModuleGenerateCommandTest.php @@ -0,0 +1,108 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Tests\Command; + + +use Symfony\Component\Console\Tester\CommandTester; +use Symfony\Component\Filesystem\Filesystem; +use Thelia\Core\Application; +use Thelia\Command\ModuleGenerateCommand; + +class ModuleGenerateCommandTest extends BaseCommandTest { + + protected $command; + protected $commandTester; + + public static function clearTest() + { + $fs = new Filesystem(); + + if ($fs->exists(THELIA_MODULE_DIR . "Test")) { + $fs->remove(THELIA_MODULE_DIR . "Test"); + } + } + + public static function setUpBeforeClass() + { + self::clearTest(); + } + + public static function tearDownAfterClass() + { + self::clearTest(); + } + + public function setUp() + { + $application = new Application($this->getKernel()); + + $moduleGenerator = new ModuleGenerateCommand(); + + $application->add($moduleGenerator); + + $this->command = $application->find("module:generate"); + $this->commandTester = new CommandTester($this->command); + + } + + public function testGenerateModule() + { + $tester = $this->commandTester; + + $tester->execute(array( + "command" => $this->command->getName(), + "name" => "test" + )); + + $fs = new Filesystem(); + + $this->assertTrue($fs->exists(THELIA_MODULE_DIR . "Test")); + } + + /** + * @depends testGenerateModule + * @expectedException \RuntimeException + */ + public function testGenerateDuplicateModule() + { + $tester = $this->commandTester; + + $tester->execute(array( + "command" => $this->command->getName(), + "name" => "test" + )); + } + + /** + * @expectedException \RuntimeException + */ + public function testGenerateWithReservedKeyWord() + { + $tester = $this->commandTester; + + $tester->execute(array( + "command" => $this->command->getName(), + "name" => "thelia" + )); + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Log/TlogTest.php b/core/lib/Thelia/Tests/Log/TlogTest.php index bde1cdb39..eabc18338 100755 --- a/core/lib/Thelia/Tests/Log/TlogTest.php +++ b/core/lib/Thelia/Tests/Log/TlogTest.php @@ -29,8 +29,7 @@ class TlogTest extends \PHPUnit_Framework_TestCase { protected static $logger; - //protected $regex = "/(\\d)(:)(\\s+)(%s)(\\s+)(\\[.*?\\])(\\s+)(\\{.*?\\})(\\s+)(\\d{4})(-)(\\d{2})(-)(\\d{2})(\\s+)(\\d{2})(:)(\\d{2})(:)(\\d{2})(:)(\\s+)(%s)([\n])/is"; - protected $regex = "/[0-9]+:[\s](%s)+[\s]\[[a-zA-Z\.]+:[a-zA-Z]+\(\)\][\s]\{[0-9]+\}[\s][0-9]{4}-[0-9]{2}-[0-9]{2}[\s][0-9]{2}:[0-9]{2}:[0-9]{2}:[\s](%s).*$/is"; + protected $regex = "/[0-9]+:[\s](%s)+[\s]\[[a-zA-Z\.]+:[a-zA-Z]+\(\)\][\s]\{[0-9]+\}[\s][0-9]{4}-[0-9]{2}-[0-9]{2}[\s][0-9]{1,2}:[0-9]{2}:[0-9]{2}:[\s](%s).*$/is"; public static function setUpBeforeClass() { diff --git a/local/config/database.yml.sample b/local/config/database.yml.sample old mode 100644 new mode 100755 diff --git a/local/config/schema.xml b/local/config/schema.xml index 8b97f4e8c..cae47a184 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -1,6 +1,6 @@ - - + +
@@ -19,7 +19,7 @@
- +
@@ -54,7 +54,7 @@
- +
@@ -71,7 +71,7 @@
- +
@@ -92,7 +92,7 @@
- +
@@ -102,7 +102,7 @@
- +
@@ -110,7 +110,7 @@
- +
@@ -136,7 +136,7 @@
- +
@@ -149,7 +149,7 @@
- +
@@ -167,7 +167,7 @@
- +
@@ -194,7 +194,7 @@
- +
@@ -212,7 +212,7 @@
- +
@@ -224,7 +224,7 @@
- +
@@ -243,12 +243,12 @@
- +
- +
@@ -273,7 +273,7 @@
- +
@@ -293,7 +293,7 @@
- +
@@ -311,7 +311,7 @@
- +
@@ -326,7 +326,7 @@
- +
@@ -360,7 +360,7 @@
- +
@@ -389,7 +389,7 @@
- +
@@ -400,7 +400,7 @@
- +
@@ -409,7 +409,7 @@
- +
@@ -428,7 +428,7 @@
- +
@@ -445,7 +445,7 @@
- +
@@ -471,7 +471,7 @@
- +
@@ -512,7 +512,7 @@
- +
@@ -553,7 +553,7 @@
- +
@@ -602,7 +602,7 @@
- +
@@ -611,7 +611,7 @@
- +
@@ -626,7 +626,7 @@
- +
@@ -645,7 +645,7 @@
- +
@@ -657,7 +657,7 @@
- +
@@ -670,7 +670,7 @@
- +
@@ -688,7 +688,7 @@
- +
@@ -707,13 +707,13 @@
- +
- +
@@ -725,7 +725,7 @@
- +
@@ -740,7 +740,7 @@
- +
@@ -755,7 +755,7 @@
- +
@@ -765,7 +765,7 @@
- +
@@ -783,7 +783,7 @@
- +
@@ -803,7 +803,7 @@
- +
@@ -822,7 +822,7 @@
- +
@@ -839,7 +839,7 @@
- +
@@ -872,7 +872,7 @@
- +
@@ -886,7 +886,7 @@
- +
@@ -900,7 +900,7 @@
- +
@@ -913,7 +913,7 @@
- +
@@ -922,7 +922,7 @@
- +
diff --git a/templates/admin/default/404.html b/templates/admin/default/404.html old mode 100644 new mode 100755 diff --git a/templates/smarty-sample/connexion.html b/templates/smarty-sample/connexion.html old mode 100644 new mode 100755 diff --git a/templates/smarty-sample/included.html b/templates/smarty-sample/included.html old mode 100644 new mode 100755