Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
d5469f1e
Commit
d5469f1e
authored
Mar 07, 2011
by
Igor Wiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change file structure (move vendor and autoload out of src), latest Symfony2
parent
2bff0c98
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
.gitmodules
.gitmodules
+1
-1
autoload.php
autoload.php
+1
-1
compile.php
compile.php
+1
-1
src/Silex/Compiler.php
src/Silex/Compiler.php
+3
-3
src/vendor/symfony
src/vendor/symfony
+0
-1
tests/bootstrap.php
tests/bootstrap.php
+2
-2
vendor/symfony
vendor/symfony
+1
-0
No files found.
.gitmodules
View file @
d5469f1e
[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
src/
autoload.php
→
autoload.php
View file @
d5469f1e
...
@@ -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
();
compile.php
View file @
d5469f1e
<?php
<?php
require_once
__DIR__
.
'/
src/
autoload.php'
;
require_once
__DIR__
.
'/autoload.php'
;
use
Silex\Compiler
;
use
Silex\Compiler
;
...
...
src/Silex/Compiler.php
View file @
d5469f1e
...
@@ -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;
...
...
symfony
@
d2840aaa
Subproject commit d2840aaad31c31dfa75a08fe32d8e21aa0553ba7
tests/bootstrap.php
View file @
d5469f1e
...
@@ -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
;
}
}
symfony
@
9e2262e6
Subproject commit 9e2262e6a40468cb3e50237c4d7759afbf574efe
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment