diff --git a/composer.json b/composer.json index d6bb08d5b..bb242668b 100644 --- a/composer.json +++ b/composer.json @@ -10,14 +10,14 @@ "php": ">=5.4.0", "ircmaxell/password-compat": "dev-master", "propel/propel1" : "1.6.*", - "psr/log" : "dev-master", - "symfony/class-loader": "2.1.*", - "symfony/config" : "2.1.*", - "symfony/console" : "2.1.*", - "symfony/dependency-injection" : "2.1.*", - "symfony/event-dispatcher" : "2.1.*", - "symfony/http-kernel" : "2.1.*", - "symfony/routing" : "2.1.*" + "psr/log" : "1.0", + "symfony/class-loader": "2.2.*", + "symfony/config" : "2.2.*", + "symfony/console" : "2.2.*", + "symfony/dependency-injection" : "2.2.*", + "symfony/event-dispatcher" : "2.2.*", + "symfony/http-kernel" : "2.2.*", + "symfony/routing" : "2.2.*" }, "minimum-stability": "stable", "config" : { diff --git a/composer.lock b/composer.lock index 52e38bb76..4aba6d6c5 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "668b9cca3649c47d9016fb912f74856a", + "hash": "b3f80466f5d4e8ce553b10dd65630a69", "packages": [ { "name": "ircmaxell/password-compat", @@ -15,7 +15,6 @@ "reference": "733c06c599bfeb511f54253ddb127701bce0917d", "shasum": "" }, - "time": "2013-02-13 16:58:34", "type": "library", "autoload": { "files": [ @@ -38,7 +37,8 @@ "keywords": [ "hashing", "password" - ] + ], + "time": "2013-02-13 16:58:34" }, { "name": "phing/phing", @@ -57,7 +57,6 @@ "require": { "php": ">=5.2.0" }, - "time": "2013-02-16 14:23:57", "bin": [ "bin/phing" ], @@ -90,7 +89,8 @@ "build", "task", "tool" - ] + ], + "time": "2013-02-16 14:23:57" }, { "name": "propel/propel1", @@ -110,7 +110,6 @@ "phing/phing": ">=2.4,<3.0", "php": ">=5.2.4" }, - "time": "2013-02-14 20:50:27", "bin": [ "generator/bin/propel-gen", "generator/bin/propel-gen.bat" @@ -150,11 +149,12 @@ "mapping", "orm", "persistence" - ] + ], + "time": "2013-02-14 20:50:27" }, { "name": "psr/log", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log", @@ -162,11 +162,10 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/1.0.0", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", "reference": "1.0.0", "shasum": "" }, - "time": "2012-12-21 11:40:51", "type": "library", "autoload": { "psr-0": { @@ -188,34 +187,39 @@ "log", "psr", "psr-3" - ] + ], + "time": "2012-12-21 11:40:51" }, { "name": "symfony/class-loader", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/ClassLoader", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader.git", - "reference": "v2.1.8" + "reference": "v2.2.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0", + "reference": "v2.2.0", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/finder": "2.1.*" + "symfony/finder": ">=2.0,<3.0" }, - "time": "2013-01-26 07:21:53", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\ClassLoader": "" + "Symfony\\Component\\ClassLoader\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -233,31 +237,36 @@ } ], "description": "Symfony ClassLoader Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-01 06:43:14" }, { "name": "symfony/config", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "v2.1.8" + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/Config/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-09 08:51:07", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Config": "" + "Symfony\\Component\\Config\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -275,31 +284,36 @@ } ], "description": "Symfony Config Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-17 12:27:42" }, { "name": "symfony/console", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "v2.1.8" + "reference": "v2.2.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/Console/zipball/v2.2.0", + "reference": "v2.2.0", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-17 15:20:05", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Console": "" + "Symfony\\Component\\Console\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -317,39 +331,44 @@ } ], "description": "Symfony Console Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-01 06:43:14" }, { "name": "symfony/dependency-injection", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "v2.1.8" + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/config": ">=2.2,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" }, "suggest": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" }, - "time": "2013-02-11 11:42:49", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\DependencyInjection": "" + "Symfony\\Component\\DependencyInjection\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -367,38 +386,43 @@ } ], "description": "Symfony DependencyInjection Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-11 11:43:49" }, { "name": "symfony/event-dispatcher", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.1.8" + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.1.*" + "symfony/dependency-injection": ">=2.0,<3.0" }, "suggest": { - "symfony/dependency-injection": "2.1.*", - "symfony/http-kernel": "2.1.*" + "symfony/dependency-injection": "2.2.*", + "symfony/http-kernel": "2.2.*" }, - "time": "2013-02-11 11:26:14", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\EventDispatcher": "" + "Symfony\\Component\\EventDispatcher\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -416,33 +440,40 @@ } ], "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-11 11:26:43" }, { "name": "symfony/http-foundation", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.1.8" + "reference": "v2.2.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0", + "reference": "v2.2.0", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-02-22 18:02:22", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\HttpFoundation": "", - "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" - } + "Symfony\\Component\\HttpFoundation\\": "" + }, + "classmap": [ + "Symfony/Component/HttpFoundation/Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -459,51 +490,58 @@ } ], "description": "Symfony HttpFoundation Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-26 09:42:13" }, { "name": "symfony/http-kernel", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "v2.1.8" + "reference": "v2.2.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0", + "reference": "v2.2.0", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.1.*", - "symfony/http-foundation": "2.1.*" + "psr/log": ">=1.0,<2.0", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/http-foundation": ">=2.2,<2.3-dev" }, "require-dev": { - "symfony/browser-kit": "2.1.*", - "symfony/class-loader": "2.1.*", - "symfony/config": "2.1.*", - "symfony/console": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "symfony/finder": "2.1.*", - "symfony/process": "2.1.*", - "symfony/routing": "2.1.*" + "symfony/browser-kit": "2.2.*", + "symfony/class-loader": ">=2.1,<3.0", + "symfony/config": ">=2.0,<3.0", + "symfony/console": "2.2.*", + "symfony/dependency-injection": ">=2.0,<3.0", + "symfony/finder": ">=2.0,<3.0", + "symfony/process": ">=2.0,<3.0", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "suggest": { - "symfony/browser-kit": "2.1.*", - "symfony/class-loader": "2.1.*", - "symfony/config": "2.1.*", - "symfony/console": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "symfony/finder": "2.1.*" + "symfony/browser-kit": "2.2.*", + "symfony/class-loader": "2.2.*", + "symfony/config": "2.2.*", + "symfony/console": "2.2.*", + "symfony/dependency-injection": "2.2.*", + "symfony/finder": "2.2.*" }, - "time": "2013-02-23 21:28:36", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\HttpKernel": "" + "Symfony\\Component\\HttpKernel\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -521,21 +559,22 @@ } ], "description": "Symfony HttpKernel Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-01 06:52:29" }, { "name": "symfony/routing", - "version": "v2.1.8", + "version": "v2.2.0", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "v2.1.8" + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { @@ -543,20 +582,24 @@ }, "require-dev": { "doctrine/common": ">=2.2,<3.0", - "symfony/config": "2.1.*", - "symfony/http-kernel": "2.1.*", - "symfony/yaml": "2.1.*" + "psr/log": ">=1.0,<2.0", + "symfony/config": ">=2.2,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" }, "suggest": { "doctrine/common": "~2.2", - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" }, - "time": "2013-02-22 18:53:49", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Routing": "" + "Symfony\\Component\\Routing\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -574,16 +617,24 @@ } ], "description": "Symfony Routing Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-11 11:24:47" } ], - "packages-dev": null, + "packages-dev": [ + + ], "aliases": [ ], "minimum-stability": "stable", "stability-flags": { - "ircmaxell/password-compat": 20, - "psr/log": 20 - } + "ircmaxell/password-compat": 20 + }, + "platform": { + "php": ">=5.4.0" + }, + "platform-dev": [ + + ] } diff --git a/core/lib/Thelia/Tpex b/core/lib/Thelia/Tpex index 75fc24db8..0a3c05356 160000 --- a/core/lib/Thelia/Tpex +++ b/core/lib/Thelia/Tpex @@ -1 +1 @@ -Subproject commit 75fc24db853714043cdce5b71b4728774e45fb94 +Subproject commit 0a3c05356156204cef89554ef1811b914d300614