TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test de commit

Browse Source
This commit is contained in:
Manuel Raynaud
2012-10-09 15:53:12 +02:00
parent 47ccf66db5
commit 1578bec3d1
5 changed files with 332 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/bootstrap.php
View File

@@ -3,9 +3,9 @@
if(!isset($env)){ if(!isset($env)){
$env = 'prod'; $env = 'prod';
} }
//
use Symfony\Component\DependencyInjection; //use Symfony\Component\DependencyInjection;
use Symfony\Component\DependencyInjection\Reference; //use Symfony\Component\DependencyInjection\Reference;
/** /**

338
core/composer.lock generated
View File

@@ -2,40 +2,342 @@
"hash": "49f3143b77fd4fbd695a56746b52042a", "hash": "49f3143b77fd4fbd695a56746b52042a",
"packages": [ "packages": [
{ {
"package": "symfony/class-loader", "name": "symfony/class-loader",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/ClassLoader",
"source": {
"type": "git",
"url": "https://github.com/symfony/ClassLoader",
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/ClassLoader/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/finder": "2.1.*"
},
"time": "2012-09-01 07:02:36",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\ClassLoader": ""
}
}
}, },
{ {
"package": "symfony/config", "name": "symfony/config",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config",
"reference": "v2.1.0-RC2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Config/zipball/v2.1.0-RC2",
"reference": "v2.1.0-RC2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-08-22 11:48:41",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Config": ""
}
}
}, },
{ {
"package": "symfony/console", "name": "symfony/console",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console",
"reference": "v2.1.0-RC2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Console/zipball/v2.1.0-RC2",
"reference": "v2.1.0-RC2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-08-22 11:48:41",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Console": ""
}
}
}, },
{ {
"package": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection",
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/DependencyInjection/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/yaml": "2.1.*",
"symfony/config": "2.1.*"
},
"suggest": {
"symfony/yaml": "2.1.*",
"symfony/config": "2.1.*"
},
"time": "2012-09-17 18:41:57",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\DependencyInjection": ""
}
}
}, },
{ {
"package": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher",
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/dependency-injection": "2.1.*"
},
"suggest": {
"symfony/dependency-injection": "2.1.*",
"symfony/http-kernel": "2.1.*"
},
"time": "2012-09-10 08:53:42",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\EventDispatcher": ""
}
}
}, },
{ {
"package": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation",
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpFoundation/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-09-18 14:09:52",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpFoundation": "",
"SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs"
}
}
}, },
{ {
"package": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel",
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpKernel/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/event-dispatcher": "2.1.*",
"symfony/http-foundation": "2.1.*"
},
"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.*"
},
"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.*"
},
"time": "2012-09-20 05:13:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpKernel": ""
}
}
}, },
{ {
"package": "symfony/routing", "name": "symfony/routing",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing",
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Routing/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"symfony/http-kernel": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
},
"suggest": {
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
},
"time": "2012-09-10 08:53:42",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Routing": ""
}
}
}, },
{ {
"package": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.1.2" "version": "v2.1.2",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml",
"reference": "v2.1.0-RC2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Yaml/zipball/v2.1.0-RC2",
"reference": "v2.1.0-RC2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-08-22 11:48:41",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Yaml": ""
}
}
} }
], ],
"packages-dev": null, "packages-dev": null,

3
core/lib/Thelia/Core/Thelia.php
View File

@@ -18,9 +18,6 @@ use Symfony\Component\Config\Loader\LoaderInterface;
class Thelia extends Kernel { class Thelia extends Kernel {
const version = '0.0.1';
protected function initializeContainer(){ protected function initializeContainer(){
if(false === $container = require THELIA_ROOT . '/local/config/container.php'){ if(false === $container = require THELIA_ROOT . '/local/config/container.php'){
/** /**

8
core/vendor/composer/autoload_real.php vendored
View File

@@ -6,9 +6,15 @@ require __DIR__ . '/ClassLoader.php';
class ComposerAutoloaderInit class ComposerAutoloaderInit
{ {
private static $loader;
public static function getLoader() public static function getLoader()
{ {
$loader = new \Composer\Autoload\ClassLoader(); if (null !== static::$loader) {
return static::$loader;
}
static::$loader = $loader = new \Composer\Autoload\ClassLoader();
$vendorDir = dirname(__DIR__); $vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);

2
index_dev.php
View File

@@ -3,7 +3,7 @@
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Thelia\Core\Thelia; use Thelia\Core\Thelia;
use Symfony\Component\DependencyInjection; //use Symfony\Component\DependencyInjection;
$env = 'debug'; $env = 'debug';
require __DIR__ . '/core/bootstrap.php'; require __DIR__ . '/core/bootstrap.php';