From f9068878c7d4058c1d9390d79b408f1d119db74f Mon Sep 17 00:00:00 2001 From: franck Date: Fri, 7 Jun 2013 15:31:05 +0200 Subject: [PATCH 1/2] Debut du travail sur le B.O. --- composer.json | 10 +- composer.lock | 837 +++++++++++++++++- core/lib/Thelia/Config/Resources/routing.xml | 2 +- .../Resources/routing/admin_routing.xml | 10 - .../Config/Resources/routing/routing.xml | 8 - core/lib/Thelia/Core/Thelia.php | 25 +- web/index_dev.php | 1 - 7 files changed, 837 insertions(+), 56 deletions(-) delete mode 100644 core/lib/Thelia/Config/Resources/routing/admin_routing.xml delete mode 100644 core/lib/Thelia/Config/Resources/routing/routing.xml diff --git a/composer.json b/composer.json index 3cb4e6bf1..dacad79c1 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,13 @@ "symfony/http-kernel" : "2.2.*", "symfony/routing" : "2.2.*", "symfony/yaml" : "2.2.*", - "symfony-cmf/routing": "1.0.0" + "symfony-cmf/routing": "1.0.0", + + "symfony/form": "2.2.*", + "symfony/validator": "2.2.*", + "symfony/security": "2.2.*", + "symfony/templating": "2.2.*", + "noiselabs/smarty-bundle": "dev-master" }, "require-dev" : { "fzaninotto/faker": "dev-master" @@ -31,7 +37,7 @@ "bin-dir" : "bin" }, "autoload": { - "psr-0": { + "psr-0": { "": "local/modules/", "Thelia" : "core/lib/" } diff --git a/composer.lock b/composer.lock index 8b5668da7..3bd3b3018 100644 --- a/composer.lock +++ b/composer.lock @@ -3,8 +3,77 @@ "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": "fed0f90bca039760e3021c1febd59371", + "hash": "2bf9c04bf66c2e738eabf0ccc28f29e4", "packages": [ + { + "name": "doctrine/common", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common", + "reference": "2.3.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/common/zipball/2.3.0", + "reference": "2.3.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "collections", + "eventmanager", + "persistence", + "spl" + ], + "time": "2012-09-19 22:55:18" + }, { "name": "ezyang/htmlpurifier", "version": "dev-master", @@ -31,7 +100,7 @@ "library/HTMLPurifier.composer.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "LGPL" ], @@ -69,14 +138,14 @@ "lib/password.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "Anthony Ferrara", - "email": "ircmaxell@ircmaxell.com", + "email": "ircmaxell@php.net", "homepage": "http://blog.ircmaxell.com" } ], @@ -88,6 +157,74 @@ ], "time": "2013-05-10 11:19:13" }, + { + "name": "noiselabs/smarty-bundle", + "version": "dev-master", + "target-dir": "NoiseLabs/Bundle/SmartyBundle", + "source": { + "type": "git", + "url": "https://github.com/noiselabs/SmartyBundle.git", + "reference": "a605ae7cd1abd6005fc0a5bcebb87366f7a0c73d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/noiselabs/SmartyBundle/zipball/a605ae7cd1abd6005fc0a5bcebb87366f7a0c73d", + "reference": "a605ae7cd1abd6005fc0a5bcebb87366f7a0c73d", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "smarty/smarty": "3.1.*@stable", + "symfony/framework-bundle": ">=2.1.0" + }, + "require-dev": { + "symfony/assetic-bundle": ">=2.0", + "symfony/security": ">=2.1.0", + "symfony/yaml": ">=2.1.0" + }, + "suggest": { + "knplabs/knp-menu-bundle": "Smarty3 integration with KnpMenu (object oriented menus)", + "liip/theme-bundle": "Integration of Twitter Bootstrap into Symfony2 (themes)", + "mopa/bootstrap-bundle": "Integration of Twitter Bootstrap into Symfony2", + "mopa/bootstrap-sandbox-bundle": "Integration of Twitter Bootstrap into Symfony2 (extra)", + "symfony/assetic-bundle": "Assetic support in Smarty templates" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "NoiseLabs\\Bundle\\SmartyBundle": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Vítor Brandão", + "email": "noisebleed@noiselabs.org", + "homepage": "http://blog.noiselabs.org" + }, + { + "name": "Community contributions", + "homepage": "https://github.com/noiselabs/SmartyBundle/contributors" + } + ], + "description": "This Symfony2 bundle provides integration for the Smarty3 template engine.", + "homepage": "http://smartybundle.noiselabs.org", + "keywords": [ + "noiselabs", + "smarty", + "symfony", + "templating" + ], + "time": "2013-05-19 17:00:41" + }, { "name": "phing/phing", "version": "2.5.0", @@ -114,7 +251,7 @@ "classes/phing/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "include-path": [ "classes" ], @@ -174,7 +311,7 @@ "generator/lib" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "include-path": [ "runtime/lib", "generator/lib" @@ -220,7 +357,7 @@ "Psr\\Log\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -238,6 +375,49 @@ ], "time": "2012-12-21 11:40:51" }, + { + "name": "smarty/smarty", + "version": "v3.1.13", + "source": { + "type": "svn", + "url": "http://smarty-php.googlecode.com/svn", + "reference": "/tags/v3.1.13/@4699" + }, + "require": { + "php": ">=5.2" + }, + "type": "library", + "autoload": { + "classmap": [ + "distribution/libs/Smarty.class.php", + "distribution/libs/SmartyBC.class.php" + ] + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Monte Ohrt", + "email": "monte@ohrt.com" + }, + { + "name": "Uwe Tews", + "email": "uwe.tews@googlemail.com" + }, + { + "name": "Rodney Rehm", + "email": "rodney.rehm@medialize.de" + } + ], + "description": "Smarty - the compiling PHP template engine", + "homepage": "http://www.smarty.net", + "keywords": [ + "templating" + ], + "time": "2013-01-26 12:03:52" + }, { "name": "symfony-cmf/routing", "version": "1.0.0", @@ -269,7 +449,7 @@ "Symfony\\Cmf\\Component\\Routing": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -319,7 +499,7 @@ "Symfony\\Component\\ClassLoader\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -366,7 +546,7 @@ "Symfony\\Component\\Config\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -413,7 +593,7 @@ "Symfony\\Component\\Console\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -468,7 +648,7 @@ "Symfony\\Component\\DependencyInjection\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -522,7 +702,7 @@ "Symfony\\Component\\EventDispatcher\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -540,6 +720,179 @@ "homepage": "http://symfony.com", "time": "2013-02-11 11:26:43" }, + { + "name": "symfony/filesystem", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Filesystem", + "source": { + "type": "git", + "url": "https://github.com/symfony/Filesystem.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Filesystem\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "http://symfony.com", + "time": "2013-01-17 15:25:59" + }, + { + "name": "symfony/form", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Form", + "source": { + "type": "git", + "url": "https://github.com/symfony/Form.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Form/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/locale": ">=2.0,<3.0", + "symfony/options-resolver": ">=2.1,<2.3-dev", + "symfony/property-access": ">=2.2,<2.3-dev" + }, + "require-dev": { + "symfony/http-foundation": ">=2.1,<2.3-dev", + "symfony/validator": ">=2.2,<2.3-dev" + }, + "suggest": { + "symfony/http-foundation": "2.2.*", + "symfony/validator": "2.2.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Form\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Form Component", + "homepage": "http://symfony.com", + "time": "2013-04-01 08:06:05" + }, + { + "name": "symfony/framework-bundle", + "version": "v2.2.1", + "target-dir": "Symfony/Bundle/FrameworkBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/FrameworkBundle.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/FrameworkBundle/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "doctrine/common": ">=2.2,<3.0", + "php": ">=5.3.3", + "symfony/config": ">=2.2,<2.3-dev", + "symfony/dependency-injection": ">=2.0,<3.0", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/filesystem": ">=2.1,<2.3-dev", + "symfony/http-kernel": ">=2.2,<2.3-dev", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/stopwatch": ">=2.2,<2.3-dev", + "symfony/templating": ">=2.1,<3.0", + "symfony/translation": ">=2.2,<2.3-dev" + }, + "require-dev": { + "symfony/finder": ">=2.0,<3.0", + "symfony/security": ">=2.2,<2.3-dev" + }, + "suggest": { + "symfony/console": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/form": "2.2.*", + "symfony/validator": "2.2.*" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Bundle\\FrameworkBundle\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony FrameworkBundle", + "homepage": "http://symfony.com", + "time": "2013-04-06 10:15:43" + }, { "name": "symfony/http-foundation", "version": "v2.2.1", @@ -572,7 +925,7 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -641,7 +994,7 @@ "Symfony\\Component\\HttpKernel\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -659,6 +1012,169 @@ "homepage": "http://symfony.com", "time": "2013-04-06 10:16:33" }, + { + "name": "symfony/locale", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Locale", + "source": { + "type": "git", + "url": "https://github.com/symfony/Locale.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Locale/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-intl": "to use other locales than built-in `en`" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Locale\\": "" + }, + "classmap": [ + "Symfony/Component/Locale/Resources/stubs" + ] + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Locale Component", + "homepage": "http://symfony.com", + "time": "2013-02-01 09:33:53" + }, + { + "name": "symfony/options-resolver", + "version": "v2.2.1", + "target-dir": "Symfony/Component/OptionsResolver", + "source": { + "type": "git", + "url": "https://github.com/symfony/OptionsResolver.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\OptionsResolver\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony OptionsResolver Component", + "homepage": "http://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2013-01-17 15:25:59" + }, + { + "name": "symfony/property-access", + "version": "v2.2.1", + "target-dir": "Symfony/Component/PropertyAccess", + "source": { + "type": "git", + "url": "https://github.com/symfony/PropertyAccess.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\PropertyAccess\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony PropertyAccess Component", + "homepage": "http://symfony.com", + "keywords": [ + "access", + "array", + "extraction", + "index", + "injection", + "object", + "property", + "property path", + "reflection" + ], + "time": "2013-03-28 15:37:15" + }, { "name": "symfony/routing", "version": "v2.2.1", @@ -699,7 +1215,7 @@ "Symfony\\Component\\Routing\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -717,6 +1233,282 @@ "homepage": "http://symfony.com", "time": "2013-03-23 12:03:22" }, + { + "name": "symfony/security", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Security", + "source": { + "type": "git", + "url": "https://github.com/symfony/Security.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Security/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/http-foundation": ">=2.1,<2.3-dev", + "symfony/http-kernel": ">=2.1,<=2.3-dev" + }, + "require-dev": { + "doctrine/common": ">=2.2,<3.0", + "doctrine/dbal": ">=2.2,<3.0", + "psr/log": ">=1.0,<2.0", + "symfony/form": ">=2.0,<3.0", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/validator": ">=2.2,<2.3-dev" + }, + "suggest": { + "doctrine/dbal": "to use the built-in ACL implementation", + "symfony/class-loader": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/form": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/validator": "2.2.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Security\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Security Component", + "homepage": "http://symfony.com", + "time": "2013-04-01 08:06:05" + }, + { + "name": "symfony/stopwatch", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Stopwatch", + "source": { + "type": "git", + "url": "https://github.com/symfony/Stopwatch.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Stopwatch\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "http://symfony.com", + "time": "2013-01-04 16:58:00" + }, + { + "name": "symfony/templating", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Templating", + "source": { + "type": "git", + "url": "https://github.com/symfony/Templating.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Templating/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Templating\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Templating Component", + "homepage": "http://symfony.com", + "time": "2013-01-17 15:25:59" + }, + { + "name": "symfony/translation", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Translation", + "source": { + "type": "git", + "url": "https://github.com/symfony/Translation.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/config": ">=2.0,<2.3-dev", + "symfony/yaml": ">=2.2,<3.0" + }, + "suggest": { + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Translation\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "http://symfony.com", + "time": "2013-04-01 08:06:05" + }, + { + "name": "symfony/validator", + "version": "v2.2.1", + "target-dir": "Symfony/Component/Validator", + "source": { + "type": "git", + "url": "https://github.com/symfony/Validator.git", + "reference": "v2.2.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.1", + "reference": "v2.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/translation": ">=2.0,<3.0" + }, + "require-dev": { + "symfony/config": ">=2.2,<2.3-dev", + "symfony/http-foundation": ">=2.1,<3.0", + "symfony/locale": ">=2.0,<3.0", + "symfony/yaml": ">=2.0,<3.0" + }, + "suggest": { + "doctrine/common": "~2.2", + "symfony/config": "2.2.*", + "symfony/http-foundation": "2.2.*", + "symfony/locale": "2.2.*", + "symfony/yaml": "2.2.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Validator\\": "" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Validator Component", + "homepage": "http://symfony.com", + "time": "2013-04-01 08:06:05" + }, { "name": "symfony/yaml", "version": "v2.2.1", @@ -746,7 +1538,7 @@ "Symfony\\Component\\Yaml\\": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -772,12 +1564,12 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "202c8517478011464e0e50923cab2bcd6344453b" + "reference": "c09176c838f30da83ba9e509151d055c0bb837c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/202c8517478011464e0e50923cab2bcd6344453b", - "reference": "202c8517478011464e0e50923cab2bcd6344453b", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/c09176c838f30da83ba9e509151d055c0bb837c8", + "reference": "c09176c838f30da83ba9e509151d055c0bb837c8", "shasum": "" }, "require": { @@ -795,7 +1587,7 @@ "Faker\\PHPUnit": "test/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -810,7 +1602,7 @@ "faker", "fixtures" ], - "time": "2013-05-20 20:34:10" + "time": "2013-05-29 13:25:57" } ], "aliases": [ @@ -820,6 +1612,7 @@ "stability-flags": { "ezyang/htmlpurifier": 20, "ircmaxell/password-compat": 20, + "noiselabs/smarty-bundle": 20, "fzaninotto/faker": 20 }, "platform": { diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml index d40d28a2f..78a5ff5d4 100644 --- a/core/lib/Thelia/Config/Resources/routing.xml +++ b/core/lib/Thelia/Config/Resources/routing.xml @@ -44,7 +44,7 @@ - routing.xml + admin.xml %kernel.cache_dir% %kernel.debug% diff --git a/core/lib/Thelia/Config/Resources/routing/admin_routing.xml b/core/lib/Thelia/Config/Resources/routing/admin_routing.xml deleted file mode 100644 index d2182ef50..000000000 --- a/core/lib/Thelia/Config/Resources/routing/admin_routing.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - Thelia\Controller\Admin - - \ No newline at end of file diff --git a/core/lib/Thelia/Config/Resources/routing/routing.xml b/core/lib/Thelia/Config/Resources/routing/routing.xml deleted file mode 100644 index 95dbfb17b..000000000 --- a/core/lib/Thelia/Config/Resources/routing/routing.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index a5a24532a..117aefdd7 100644 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -58,7 +58,7 @@ class Thelia extends Kernel { protected $tpexConfig; - + public function init() { parent::init(); @@ -67,7 +67,7 @@ class Thelia extends Kernel } $this->initPropel(); } - + protected function initPropel() { if (file_exists(THELIA_ROOT . '/local/config/database.yml') === false) { @@ -104,10 +104,10 @@ class Thelia extends Kernel } /** - * - * Load some configuration + * + * Load some configuration * Initialize all plugins - * + * */ protected function loadConfiguration(ContainerBuilder $container) { @@ -124,18 +124,19 @@ class Thelia extends Kernel try { $loader = new XmlFileLoader($container, new FileLocator(THELIA_MODULE_DIR . "/" . ucfirst($module->getCode()) . "/Config")); $loader->load("config.xml"); - } catch(\InvalidArgumentException $e) { - + } + catch(\InvalidArgumentException $e) { + // FIXME: process module configuration exception } } } - + /** - * + * * initialize session in Request object - * + * * All param must be change in Config table - * + * * @param \Symfony\Component\HttpFoundation\Request $request */ @@ -225,7 +226,7 @@ class Thelia extends Kernel { $bundles = array( /* TheliaBundle contain all the dependency injection description */ - new Bundle\TheliaBundle() + new Bundle\TheliaBundle(), ); /** diff --git a/web/index_dev.php b/web/index_dev.php index 058c6f36a..c58adfc47 100644 --- a/web/index_dev.php +++ b/web/index_dev.php @@ -1,5 +1,4 @@ Date: Mon, 10 Jun 2013 15:36:02 +0200 Subject: [PATCH 2/2] Changement emplacmement templates --- composer.json | 3 +- composer.lock | 658 +++++++----------- core/bootstrap.php | 10 +- core/lib/Thelia/Config/Resources/routing.xml | 2 + .../Core/EventListener/ViewListener.php | 14 +- web/index.php | 1 - 6 files changed, 256 insertions(+), 432 deletions(-) diff --git a/composer.json b/composer.json index dacad79c1..f337ba884 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "symfony/validator": "2.2.*", "symfony/security": "2.2.*", "symfony/templating": "2.2.*", - "noiselabs/smarty-bundle": "dev-master" + + "smarty/smarty": "v3.1.13" }, "require-dev" : { "fzaninotto/faker": "dev-master" diff --git a/composer.lock b/composer.lock index 3bd3b3018..e06d76006 100644 --- a/composer.lock +++ b/composer.lock @@ -3,77 +3,8 @@ "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": "2bf9c04bf66c2e738eabf0ccc28f29e4", + "hash": "99723c2a60c60c88a67d0f2a39338864", "packages": [ - { - "name": "doctrine/common", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/common", - "reference": "2.3.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/doctrine/common/zipball/2.3.0", - "reference": "2.3.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common": "lib/" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Common Library for Doctrine projects", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "annotations", - "collections", - "eventmanager", - "persistence", - "spl" - ], - "time": "2012-09-19 22:55:18" - }, { "name": "ezyang/htmlpurifier", "version": "dev-master", @@ -157,74 +88,6 @@ ], "time": "2013-05-10 11:19:13" }, - { - "name": "noiselabs/smarty-bundle", - "version": "dev-master", - "target-dir": "NoiseLabs/Bundle/SmartyBundle", - "source": { - "type": "git", - "url": "https://github.com/noiselabs/SmartyBundle.git", - "reference": "a605ae7cd1abd6005fc0a5bcebb87366f7a0c73d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/noiselabs/SmartyBundle/zipball/a605ae7cd1abd6005fc0a5bcebb87366f7a0c73d", - "reference": "a605ae7cd1abd6005fc0a5bcebb87366f7a0c73d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "smarty/smarty": "3.1.*@stable", - "symfony/framework-bundle": ">=2.1.0" - }, - "require-dev": { - "symfony/assetic-bundle": ">=2.0", - "symfony/security": ">=2.1.0", - "symfony/yaml": ">=2.1.0" - }, - "suggest": { - "knplabs/knp-menu-bundle": "Smarty3 integration with KnpMenu (object oriented menus)", - "liip/theme-bundle": "Integration of Twitter Bootstrap into Symfony2 (themes)", - "mopa/bootstrap-bundle": "Integration of Twitter Bootstrap into Symfony2", - "mopa/bootstrap-sandbox-bundle": "Integration of Twitter Bootstrap into Symfony2 (extra)", - "symfony/assetic-bundle": "Assetic support in Smarty templates" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-0": { - "NoiseLabs\\Bundle\\SmartyBundle": "" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Vítor Brandão", - "email": "noisebleed@noiselabs.org", - "homepage": "http://blog.noiselabs.org" - }, - { - "name": "Community contributions", - "homepage": "https://github.com/noiselabs/SmartyBundle/contributors" - } - ], - "description": "This Symfony2 bundle provides integration for the Smarty3 template engine.", - "homepage": "http://smartybundle.noiselabs.org", - "keywords": [ - "noiselabs", - "smarty", - "symfony", - "templating" - ], - "time": "2013-05-19 17:00:41" - }, { "name": "phing/phing", "version": "2.5.0", @@ -469,17 +332,17 @@ }, { "name": "symfony/class-loader", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/ClassLoader", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -499,7 +362,7 @@ "Symfony\\Component\\ClassLoader\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -515,21 +378,21 @@ ], "description": "Symfony ClassLoader Component", "homepage": "http://symfony.com", - "time": "2013-03-19 08:32:26" + "time": "2013-05-06 20:02:13" }, { "name": "symfony/config", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Config/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -546,7 +409,7 @@ "Symfony\\Component\\Config\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -562,21 +425,21 @@ ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2013-03-01 10:42:10" + "time": "2013-05-10 18:08:31" }, { "name": "symfony/console", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Console/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -593,7 +456,7 @@ "Symfony\\Component\\Console\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -609,21 +472,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2013-03-19 20:48:08" + "time": "2013-05-27 14:47:40" }, { "name": "symfony/dependency-injection", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -648,7 +511,7 @@ "Symfony\\Component\\DependencyInjection\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -664,21 +527,21 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "http://symfony.com", - "time": "2013-03-23 07:49:54" + "time": "2013-05-06 08:37:50" }, { "name": "symfony/event-dispatcher", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -702,7 +565,7 @@ "Symfony\\Component\\EventDispatcher\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -720,66 +583,19 @@ "homepage": "http://symfony.com", "time": "2013-02-11 11:26:43" }, - { - "name": "symfony/filesystem", - "version": "v2.2.1", - "target-dir": "Symfony/Component/Filesystem", - "source": { - "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "v2.2.1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.2.1", - "reference": "v2.2.1", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Filesystem\\": "" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "2013-01-17 15:25:59" - }, { "name": "symfony/form", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Form", "source": { "type": "git", "url": "https://github.com/symfony/Form.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Form/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Form/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -808,7 +624,7 @@ "Symfony\\Component\\Form\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -824,88 +640,21 @@ ], "description": "Symfony Form Component", "homepage": "http://symfony.com", - "time": "2013-04-01 08:06:05" - }, - { - "name": "symfony/framework-bundle", - "version": "v2.2.1", - "target-dir": "Symfony/Bundle/FrameworkBundle", - "source": { - "type": "git", - "url": "https://github.com/symfony/FrameworkBundle.git", - "reference": "v2.2.1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/FrameworkBundle/zipball/v2.2.1", - "reference": "v2.2.1", - "shasum": "" - }, - "require": { - "doctrine/common": ">=2.2,<3.0", - "php": ">=5.3.3", - "symfony/config": ">=2.2,<2.3-dev", - "symfony/dependency-injection": ">=2.0,<3.0", - "symfony/event-dispatcher": ">=2.1,<3.0", - "symfony/filesystem": ">=2.1,<2.3-dev", - "symfony/http-kernel": ">=2.2,<2.3-dev", - "symfony/routing": ">=2.2,<2.3-dev", - "symfony/stopwatch": ">=2.2,<2.3-dev", - "symfony/templating": ">=2.1,<3.0", - "symfony/translation": ">=2.2,<2.3-dev" - }, - "require-dev": { - "symfony/finder": ">=2.0,<3.0", - "symfony/security": ">=2.2,<2.3-dev" - }, - "suggest": { - "symfony/console": "2.2.*", - "symfony/finder": "2.2.*", - "symfony/form": "2.2.*", - "symfony/validator": "2.2.*" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Bundle\\FrameworkBundle\\": "" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony FrameworkBundle", - "homepage": "http://symfony.com", - "time": "2013-04-06 10:15:43" + "time": "2013-06-02 12:05:41" }, { "name": "symfony/http-foundation", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -925,7 +674,7 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -941,21 +690,21 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-04-06 10:15:43" + "time": "2013-05-27 14:47:40" }, { "name": "symfony/http-kernel", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -994,7 +743,7 @@ "Symfony\\Component\\HttpKernel\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1010,44 +759,163 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2013-04-06 10:16:33" + "time": "2013-06-02 13:03:09" }, { - "name": "symfony/locale", - "version": "v2.2.1", - "target-dir": "Symfony/Component/Locale", + "name": "symfony/icu", + "version": "v1.0.0", + "target-dir": "Symfony/Component/Icu", "source": { "type": "git", - "url": "https://github.com/symfony/Locale.git", - "reference": "v2.2.1" + "url": "https://github.com/symfony/Icu.git", + "reference": "v1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Locale/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Icu/zipball/v1.0.0", + "reference": "v1.0.0", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "symfony/intl": ">=2.3,<3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Icu\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Contains an excerpt of the ICU data and classes to load it.", + "homepage": "http://symfony.com", + "keywords": [ + "icu", + "intl" + ], + "time": "2013-06-03 18:32:07" + }, + { + "name": "symfony/intl", + "version": "v2.3.0", + "target-dir": "Symfony/Component/Intl", + "source": { + "type": "git", + "url": "https://github.com/symfony/Intl.git", + "reference": "v2.3.0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Intl/zipball/v2.3.0", + "reference": "v2.3.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/icu": ">=1.0-RC,<2.0" + }, + "require-dev": { + "symfony/filesystem": ">=2.1" }, "suggest": { - "ext-intl": "to use other locales than built-in `en`" + "ext-intl": "to use the component with locales other than \"en\"" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Intl\\": "" + }, + "classmap": [ + "Symfony/Component/Intl/Resources/stubs" + ], + "files": [ + "Symfony/Component/Intl/Resources/stubs/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch", + "homepage": "http://wiedler.ch/igor/" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + }, + { + "name": "Eriksen Costa", + "email": "eriksen.costa@infranology.com.br" + } + ], + "description": "A PHP replacement layer for the C intl extension that includes additional data from the ICU library.", + "homepage": "http://symfony.com", + "keywords": [ + "i18n", + "icu", + "internationalization", + "intl", + "l10n", + "localization" + ], + "time": "2013-05-18 11:21:22" + }, + { + "name": "symfony/locale", + "version": "v2.3.0", + "target-dir": "Symfony/Component/Locale", + "source": { + "type": "git", + "url": "https://github.com/symfony/Locale.git", + "reference": "v2.3.0-RC1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Locale/zipball/v2.3.0-RC1", + "reference": "v2.3.0-RC1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/intl": ">=2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" } }, "autoload": { "psr-0": { "Symfony\\Component\\Locale\\": "" - }, - "classmap": [ - "Symfony/Component/Locale/Resources/stubs" - ] + } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1063,21 +931,21 @@ ], "description": "Symfony Locale Component", "homepage": "http://symfony.com", - "time": "2013-02-01 09:33:53" + "time": "2013-04-11 09:29:25" }, { "name": "symfony/options-resolver", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/OptionsResolver", "source": { "type": "git", "url": "https://github.com/symfony/OptionsResolver.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1094,7 +962,7 @@ "Symfony\\Component\\OptionsResolver\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1119,17 +987,17 @@ }, { "name": "symfony/property-access", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/PropertyAccess", "source": { "type": "git", "url": "https://github.com/symfony/PropertyAccess.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1146,7 +1014,7 @@ "Symfony\\Component\\PropertyAccess\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1173,21 +1041,21 @@ "property path", "reflection" ], - "time": "2013-03-28 15:37:15" + "time": "2013-04-07 22:02:49" }, { "name": "symfony/routing", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1215,7 +1083,7 @@ "Symfony\\Component\\Routing\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1231,21 +1099,21 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-03-23 12:03:22" + "time": "2013-05-10 16:49:00" }, { "name": "symfony/security", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Security", "source": { "type": "git", "url": "https://github.com/symfony/Security.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Security/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Security/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1281,7 +1149,7 @@ "Symfony\\Component\\Security\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1297,68 +1165,21 @@ ], "description": "Symfony Security Component", "homepage": "http://symfony.com", - "time": "2013-04-01 08:06:05" - }, - { - "name": "symfony/stopwatch", - "version": "v2.2.1", - "target-dir": "Symfony/Component/Stopwatch", - "source": { - "type": "git", - "url": "https://github.com/symfony/Stopwatch.git", - "reference": "v2.2.1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/v2.2.1", - "reference": "v2.2.1", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Stopwatch\\": "" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "http://symfony.com", - "time": "2013-01-04 16:58:00" + "time": "2013-05-27 14:47:40" }, { "name": "symfony/templating", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Templating", "source": { "type": "git", "url": "https://github.com/symfony/Templating.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Templating/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Templating/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1375,7 +1196,7 @@ "Symfony\\Component\\Templating\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1391,38 +1212,38 @@ ], "description": "Symfony Templating Component", "homepage": "http://symfony.com", - "time": "2013-01-17 15:25:59" + "time": "2013-04-17 05:27:14" }, { "name": "symfony/translation", - "version": "v2.2.1", + "version": "v2.3.0", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "v2.2.1" + "reference": "v2.3.0-RC1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.3.0-RC1", + "reference": "v2.3.0-RC1", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/config": ">=2.0,<2.3-dev", + "symfony/config": ">=2.0,<3.0", "symfony/yaml": ">=2.2,<3.0" }, "suggest": { - "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*" + "symfony/config": "", + "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -1430,7 +1251,7 @@ "Symfony\\Component\\Translation\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1446,21 +1267,21 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2013-04-01 08:06:05" + "time": "2013-05-13 14:36:40" }, { "name": "symfony/validator", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Validator", "source": { "type": "git", "url": "https://github.com/symfony/Validator.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1491,7 +1312,7 @@ "Symfony\\Component\\Validator\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1507,21 +1328,21 @@ ], "description": "Symfony Validator Component", "homepage": "http://symfony.com", - "time": "2013-04-01 08:06:05" + "time": "2013-06-02 12:05:41" }, { "name": "symfony/yaml", - "version": "v2.2.1", + "version": "v2.2.2", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "v2.2.1" + "reference": "v2.2.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1", - "reference": "v2.2.1", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.2", + "reference": "v2.2.2", "shasum": "" }, "require": { @@ -1538,7 +1359,7 @@ "Symfony\\Component\\Yaml\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1554,7 +1375,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-03-23 07:49:54" + "time": "2013-05-10 18:08:31" } ], "packages-dev": [ @@ -1564,12 +1385,12 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "c09176c838f30da83ba9e509151d055c0bb837c8" + "reference": "fac6c177c87bb5d10d256d9caa6933046fbac999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/c09176c838f30da83ba9e509151d055c0bb837c8", - "reference": "c09176c838f30da83ba9e509151d055c0bb837c8", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/fac6c177c87bb5d10d256d9caa6933046fbac999", + "reference": "fac6c177c87bb5d10d256d9caa6933046fbac999", "shasum": "" }, "require": { @@ -1587,7 +1408,7 @@ "Faker\\PHPUnit": "test/" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1602,7 +1423,7 @@ "faker", "fixtures" ], - "time": "2013-05-29 13:25:57" + "time": "2013-05-31 17:07:37" } ], "aliases": [ @@ -1612,7 +1433,6 @@ "stability-flags": { "ezyang/htmlpurifier": 20, "ircmaxell/password-compat": 20, - "noiselabs/smarty-bundle": 20, "fzaninotto/faker": 20 }, "platform": { diff --git a/core/bootstrap.php b/core/bootstrap.php index 923d029e5..ba66f8036 100644 --- a/core/bootstrap.php +++ b/core/bootstrap.php @@ -5,10 +5,12 @@ * @file * Functions needed for Thelia bootstrap */ -define('THELIA_ROOT', realpath(__DIR__ .'/../') . "/"); -define('THELIA_CONF_DIR', THELIA_ROOT . '/local/config'); -define('THELIA_MODULE_DIR', THELIA_ROOT . '/local/modules'); -define('THELIA_TEMPLATE_DIR', THELIA_ROOT . 'templates/'); +define('THELIA_ROOT' , rtrim(realpath(__DIR__ .'/../'),'/') . "/"); +define('THELIA_LOCAL_DIR' , THELIA_ROOT . '/local/'); +define('THELIA_CONF_DIR' , THELIA_LOCAL_DIR . 'config/'); +define('THELIA_MODULE_DIR' , THELIA_LOCAL_DIR . 'modules/'); +define('THELIA_TEMPLATE_DIR' , THELIA_ROOT . '/web/templates/'); + $loader = require __DIR__ . "/vendor/autoload.php"; diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml index 78a5ff5d4..8dbf19427 100644 --- a/core/lib/Thelia/Config/Resources/routing.xml +++ b/core/lib/Thelia/Config/Resources/routing.xml @@ -56,10 +56,12 @@ + 0 diff --git a/core/lib/Thelia/Core/EventListener/ViewListener.php b/core/lib/Thelia/Core/EventListener/ViewListener.php index e1e417504..594840b77 100644 --- a/core/lib/Thelia/Core/EventListener/ViewListener.php +++ b/core/lib/Thelia/Core/EventListener/ViewListener.php @@ -79,19 +79,19 @@ class ViewListener implements EventSubscriberInterface } catch(ResourceNotFoundException $e) { $event->setResponse(new Response($e->getMessage(), 404)); } - + } - + public function beforeKernelView(GetResponseForControllerResultEvent $event) { $request = $this->container->get('request'); - + if (!$view = $request->attributes->get('_view')) { $request->attributes->set('_view', $this->findView($request)); } - + } - + public function findView(Request $request) { if (! $view = $request->query->get('view')) { @@ -100,7 +100,7 @@ class ViewListener implements EventSubscriberInterface $view = $request->request->get('view'); } } - + return $view; } @@ -117,7 +117,7 @@ class ViewListener implements EventSubscriberInterface KernelEvents::VIEW =>array( array('onKernelView', 0), array('beforeKernelView', 5) - ) + ) ); } } diff --git a/web/index.php b/web/index.php index 404949dc3..db8d8a51d 100644 --- a/web/index.php +++ b/web/index.php @@ -1,5 +1,4 @@