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

Readme.md

@@ -3,6 +3,7 @@ Readme
 
 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.
 

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);
+$application->run($input, new TheliaConsoleOutput());

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.*",

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",
+                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/4cf5fca150ed93b33dc54206e3d9d943d0712621",
-                "reference": "2.0.0-alpha1",
+                "reference": "4cf5fca150ed93b33dc54206e3d9d943d0712621",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4",
-                "psr/log": ">=1.0,<2.0",
+                "psr/log": "~1.0",
-                "symfony/console": ">=2.2,<3.0",
+                "symfony/console": "~2.2",
-                "symfony/filesystem": ">=2.2,<3.0",
+                "symfony/filesystem": "~2.2",
-                "symfony/finder": ">=2.2,<3.0",
+                "symfony/finder": "~2.2",
-                "symfony/validator": ">=2.2,<3.0",
+                "symfony/validator": "~2.2",
-                "symfony/yaml": ">=2.2,<3.0"
+                "symfony/yaml": "~2.2"
             },
             "require-dev": {
-                "behat/behat": ">=2.4,<3.0",
+                "behat/behat": "~2.4",
-                "monolog/monolog": ">=1.3,<2.0",
+                "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,

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

core/lib/Thelia/Command/BaseModuleGenerate.php

@@ -0,0 +1,58 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	    email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+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);
+     }
+}

core/lib/Thelia/Command/ModuleGenerateCommand.php

@@ -0,0 +1,104 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	    email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+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);
+    }
+
+
+
+}

core/lib/Thelia/Command/ModuleGenerateModelCommand.php

@@ -0,0 +1,130 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.     */
+/*                                                                                   */
+/*************************************************************************************/
+
+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);
+            }
+        }
+
+
+    }
+
+}

core/lib/Thelia/Command/ModuleGenerateSqlCommand.php

@@ -0,0 +1,85 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.     */
+/*                                                                                   */
+/*************************************************************************************/
+
+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');
+
+    }
+}

core/lib/Thelia/Command/Output/TheliaConsoleOutput.php

@@ -0,0 +1,56 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.     */
+/*                                                                                   */
+/*************************************************************************************/
+
+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)) . "  </" . $style . ">";
+        }
+
+        $this->writeln($output);
+    }
+
+}

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

@@ -0,0 +1,36 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.     */
+/*                                                                                   */
+/*************************************************************************************/
+
+
+namespace %%NAMESPACE%%;
+
+use Thelia\Module\BaseModule;
+
+class %%CLASSNAME%% extends BaseModule
+{
+    /**
+     * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class
+     * Like install and destroy
+     */
+
+}

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<config xmlns="http://thelia.net/schema/dic/config"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
+
+    <loops>
+        <!-- sample definition
+        <loop name="MySuperLoop" class="MyModule\Loop\MySuperLoop" />
+        -->
+    </loops>
+
+    <forms>
+        <!--
+        <form name="MyFormName" class="MyModule\Form\MySuperForm" />
+        -->
+    </forms>
+
+    <commands>
+        <!--
+        <command class="MyModule\Command\MySuperCommand" />
+        -->
+    </commands>
+
+    <templateDirectives>
+        <!-- Sample definition
+        <templateDirectives class="MyModule\Directive\MyTemplateDirective" name="my_filter"/>
+        -->
+    </templateDirectives>
+
+    <!--
+    <services>
+
+    </services>
+    -->
+</config>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<database defaultIdMethod="native" name="thelia" namespace="%%NAMESPACE%%\Model">
+    <!--
+    See propel documentation on http://propelorm.org for all information about schema file
+    -->
+    <external-schema filename="%%CONFIG_DIR%%schema.xml" referenceOnly="true" />
+</database>

core/lib/Thelia/Config/Resources/config.xml

@@ -34,6 +34,9 @@
     <commands>
         <command class="Thelia\Command\CacheClear"/>
         <command class="Thelia\Command\Install"/>
+        <command class="Thelia\Command\ModuleGenerateCommand"/>
+        <command class="Thelia\Command\ModuleGenerateModelCommand"/>
+        <command class="Thelia\Command\ModuleGenerateSqlCommand"/>
     </commands>
 
     <services>