Commit d5469f1e authored by Igor Wiedler's avatar Igor Wiedler

change file structure (move vendor and autoload out of src), latest Symfony2

parent 2bff0c98
[submodule "src/vendor/symfony"] [submodule "src/vendor/symfony"]
path = src/vendor/symfony path = vendor/symfony
url = git://github.com/symfony/symfony.git url = git://github.com/symfony/symfony.git
...@@ -7,6 +7,6 @@ use Symfony\Component\ClassLoader\UniversalClassLoader; ...@@ -7,6 +7,6 @@ use Symfony\Component\ClassLoader\UniversalClassLoader;
$loader = new UniversalClassLoader(); $loader = new UniversalClassLoader();
$loader->registerNamespaces(array( $loader->registerNamespaces(array(
'Symfony' => __DIR__.'/vendor/symfony/src', 'Symfony' => __DIR__.'/vendor/symfony/src',
'Silex' => __DIR__, 'Silex' => __DIR__.'/src',
)); ));
$loader->register(); $loader->register();
<?php <?php
require_once __DIR__.'/src/autoload.php'; require_once __DIR__.'/autoload.php';
use Silex\Compiler; use Silex\Compiler;
......
...@@ -38,7 +38,7 @@ class Compiler ...@@ -38,7 +38,7 @@ class Compiler
name('*.php')-> name('*.php')->
exclude('tests')-> exclude('tests')->
exclude('Bundle')-> exclude('Bundle')->
in(__DIR__.'/..'); in(__DIR__.'/../..');
foreach ($finder as $file) { foreach ($finder as $file) {
$path = str_replace(realpath(__DIR__.'/../..').'/', '', realpath($file)); $path = str_replace(realpath(__DIR__.'/../..').'/', '', realpath($file));
...@@ -64,7 +64,7 @@ class Compiler ...@@ -64,7 +64,7 @@ class Compiler
return <<<EOF return <<<EOF
<?php <?php
/* /*
* This file is part of the Silex utility. * This file is part of the Silex framework.
* *
* (c) Fabien Potencier <fabien.potencier@symfony-project.org> * (c) Fabien Potencier <fabien.potencier@symfony-project.org>
* *
...@@ -72,7 +72,7 @@ class Compiler ...@@ -72,7 +72,7 @@ class Compiler
* with this source code in the file LICENSE. * with this source code in the file LICENSE.
*/ */
require_once __DIR__.'/src/autoload.php'; require_once __DIR__.'/autoload.php';
__HALT_COMPILER(); __HALT_COMPILER();
EOF; EOF;
......
Subproject commit d2840aaad31c31dfa75a08fe32d8e21aa0553ba7
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
if (file_exists($file = __DIR__.'/../src/autoload.php')) { if (file_exists($file = __DIR__.'/../autoload.php')) {
require_once $file; require_once $file;
} elseif (file_exists($file = __DIR__.'/../src/autoload.php.dist')) { } elseif (file_exists($file = __DIR__.'/../autoload.php.dist')) {
require_once $file; require_once $file;
} }
Subproject commit 9e2262e6a40468cb3e50237c4d7759afbf574efe
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment