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

remove symfony classLoader component, using composer autoloader with

Browse Source 
dump optimized option
This commit is contained in:
Manuel Raynaud
2013-02-04 14:55:20 +01:00
parent b6fec44086
commit 9309c75e07
6 changed files with 44 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -6,3 +6,4 @@ local/config/runtime-conf.xml
propel-gen
cache/*
log/*
bin/*

35
composer.json Normal file
View File

@@ -0,0 +1,35 @@
{
"description" : "Thelia is an ecommerce CMS.",
"licence" : "GPL-3.0+",
"homepage" : "http://thelia.net",
"support" : {
"forum" : "http://thelia.net/forum",
"wiki" : "http://thelia.net/wiki"
},
"require":{
"symfony/http-kernel" : "2.1.*",
"symfony/routing" : "2.1.*",
"symfony/config" : "2.1.*",
"symfony/dependency-injection" : "2.1.*",
"symfony/console" : "2.1.*",
"symfony/event-dispatcher" : "2.1.*",
"symfony-cmf/routing" : "1.0.*@dev",
"propel/propel1" : "1.6.*",
"psr/log" : "dev-master"
},
"minimum-stability": "stable",
"config" : {
"vendor-dir" : "core/vendor",
"bin-dir" : "bin"
},
"autoload": {
"psr-0": {
"": "local/plugins/",
"Thelia" : "core/lib/"
}
},
"scripts" : {
"post-update-cmd": "composer dump-autoload -o",
"post-install-cmd": "composer dump-autoload -o"
}
}

59
core/composer.lock → composer.lock generated
View File

@@ -1,5 +1,5 @@
{
"hash": "8a668b67ef3c3dd2fe8f426c37b2db5d",
"hash": "192a769b2c4e0187b57695bd8e008456",
"packages": [
{
"name": "phing/phing",
@@ -123,7 +123,7 @@
},
"dist": {
"type": "zip",
"url": "https://github.com/php-fig/log/archive/1.0.0.zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/1.0.0",
"reference": "1.0.0",
"shasum": ""
},
@@ -158,12 +158,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony-cmf/Routing",
"reference": "817b65edad2a4318cffd5017ff7eaabb9f2b65f8"
"reference": "72df1da07b3c4edf16df169fb7987f504070fe0d"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony-cmf/Routing/archive/817b65edad2a4318cffd5017ff7eaabb9f2b65f8.zip",
"reference": "817b65edad2a4318cffd5017ff7eaabb9f2b65f8",
"url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/72df1da07b3c4edf16df169fb7987f504070fe0d",
"reference": "72df1da07b3c4edf16df169fb7987f504070fe0d",
"shasum": ""
},
"require": {
@@ -171,7 +171,7 @@
"symfony/routing": ">=2.1,<2.3-dev",
"symfony/http-kernel": ">=2.1,<2.3-dev"
},
"time": "2013-01-20 20:39:41",
"time": "2013-01-24 16:09:01",
"type": "library",
"extra": {
"branch-alias": {
@@ -200,51 +200,6 @@
"routing"
]
},
{
"name": "symfony/class-loader",
"version": "v2.1.7",
"target-dir": "Symfony/Component/ClassLoader",
"source": {
"type": "git",
"url": "https://github.com/symfony/ClassLoader",
"reference": "v2.1.7"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/ClassLoader/archive/v2.1.7.zip",
"reference": "v2.1.7",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/finder": "2.1.*"
},
"time": "2013-01-09 08:51:07",
"type": "library",
"autoload": {
"psr-0": {
"Symfony\\Component\\ClassLoader": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony ClassLoader Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/config",
"version": "v2.1.7",
@@ -509,7 +464,7 @@
"symfony/dependency-injection": "2.1.*",
"symfony/finder": "2.1.*"
},
"time": "2012-12-21 10:24:53",
"time": "2013-01-17 16:21:47",
"type": "library",
"autoload": {
"psr-0": {

18
core/autoload.php
View File

@@ -1,18 +0,0 @@
<?php
$loader = require __DIR__ . "/vendor/autoload.php";
$loader->add('Thelia', __DIR__ . '/lib/');
if (extension_loaded('apc') && $env == 'prod') {
$loader->unregister();
require __DIR__ . '/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php';
$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader("thelia",$loader);
$apcLoader->register();
return $apcLoader;
}
return $loader;

2
core/bootstrap.php
View File

@@ -8,7 +8,7 @@
define('THELIA_ROOT', __DIR__ .'/../');
define('THELIA_CONF_DIR', THELIA_ROOT . '/local/config');
define('THELIA_PLUGIN_DIR', THELIA_ROOT . '/local/plugins');
$loader = require __DIR__ . '/autoload.php';
$loader = require __DIR__ . "/vendor/autoload.php";

17
core/composer.json
View File

@@ -1,17 +0,0 @@
{
"description" : "Thelia is an ecommerce CMS.",
"licence" : "GPL 3",
"require":{
"symfony/class-loader": "2.1.*",
"symfony/http-kernel" : "2.1.*",
"symfony/routing" : "2.1.*",
"symfony/config" : "2.1.*",
"symfony/dependency-injection" : "2.1.*",
"symfony/console" : "2.1.*",
"symfony/event-dispatcher" : "2.1.*",
"symfony-cmf/routing" : "1.0.*@dev",
"propel/propel1" : "1.6.*",
"psr/log" : "dev-master"
},
"minimum-stability": "stable"
}