diff --git a/core/composer.lock b/core/composer.lock index 104cf1723..5ffa72ea2 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1,5 +1,5 @@ { - "hash": "3c86ee22b1c2f391706858ad5eaa28ec", + "hash": "6753cff6ae4e98c641837505039c66fd", "packages": [ { "name": "phing/phing", @@ -113,6 +113,55 @@ "mapping" ] }, + { + "name": "symfony-cmf/routing", + "version": "dev-master", + "target-dir": "Symfony/Cmf/Component/Routing", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/Routing", + "reference": "1.0.0-alpha3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony-cmf/Routing/archive/1.0.0-alpha3.zip", + "reference": "1.0.0-alpha3", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/routing": ">=2.1,<2.3-dev", + "symfony/http-kernel": ">=2.1,<2.3-dev" + }, + "time": "2012-12-16 17:52:57", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Cmf\\Component\\Routing": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/Routing/contributors" + } + ], + "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "database", + "routing" + ] + }, { "name": "symfony/class-loader", "version": "v2.1.4", @@ -545,7 +594,7 @@ ], "minimum-stability": "stable", - "stability-flags": [ - - ] + "stability-flags": { + "symfony-cmf/routing": 20 + } } diff --git a/index.php b/index.php deleted file mode 100644 index 32a82052e..000000000 --- a/index.php +++ /dev/null @@ -1,3 +0,0 @@ -handle($request)->prepare($request)->send(); + +$thelia->terminate($request, $response); diff --git a/index_dev.php b/web/index_dev.php similarity index 91% rename from index_dev.php rename to web/index_dev.php index 490a26338..a594309e3 100644 --- a/index_dev.php +++ b/web/index_dev.php @@ -6,7 +6,7 @@ use Thelia\Core\Thelia; //use Symfony\Component\DependencyInjection; $env = 'dev'; -require __DIR__ . '/core/bootstrap.php'; +require __DIR__ . '/../core/bootstrap.php'; $trustIp = array( '::1',