diff --git a/core/composer.json b/core/composer.json index 4c4f9267e..a50d99093 100644 --- a/core/composer.json +++ b/core/composer.json @@ -4,7 +4,6 @@ "symfony/http-kernel" : "2.1.*", "symfony/routing" : "2.1.*", "symfony/config" : "2.1.*", - "symfony/yaml" : "2.1.*", "symfony/dependency-injection" : "2.1.*", "symfony/console" : "2.1.*", "symfony/event-dispatcher" : "2.1.*", diff --git a/core/composer.lock b/core/composer.lock index ff2df0cda..104cf1723 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1,5 +1,5 @@ { - "hash": "1d8c7207462e0d701000ae6e732d0301", + "hash": "3c86ee22b1c2f391706858ad5eaa28ec", "packages": [ { "name": "phing/phing", @@ -538,53 +538,6 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com" - }, - { - "name": "symfony/yaml", - "version": "v2.1.4", - "target-dir": "Symfony/Component/Yaml", - "source": { - "type": "git", - "url": "https://github.com/symfony/Yaml", - "reference": "v2.1.4" - }, - "dist": { - "type": "zip", - "url": "https://github.com/symfony/Yaml/archive/v2.1.4.zip", - "reference": "v2.1.4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2012-11-08 09:51:48", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Symfony\\Component\\Yaml": "" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "http://symfony.com" } ], "packages-dev": null, diff --git a/index_dev.php b/index_dev.php index d8a403ff7..490a26338 100644 --- a/index_dev.php +++ b/index_dev.php @@ -5,7 +5,7 @@ use Thelia\Core\Thelia; //use Symfony\Component\DependencyInjection; -$env = 'debug'; +$env = 'dev'; require __DIR__ . '/core/bootstrap.php'; $trustIp = array( @@ -19,7 +19,7 @@ if ( false === in_array($request->getClientIp(), $trustIp)) { //change request to send to a 404 error page } -$thelia = new Thelia('dev', true); +$thelia = new Thelia($env, true); $response = $thelia->handle($request)->prepare($request)->send();