diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | 3rdparty/Symfony/Component/Routing | 0 | ||||
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | lib/base.php | 4 |
5 files changed, 14 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 4749dea19dc..4ae39ed7fac 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,7 @@ nbproject # WebFinger .well-known /.buildpath +3rdparty/autoload.php +3rdparty/composer/ +3rdparty/symfony/ +composer.lock diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 0f4ad588071..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "3rdparty/Symfony/Component/Routing"] - path = 3rdparty/Symfony/Component/Routing - url = git://github.com/symfony/Routing.git diff --git a/3rdparty/Symfony/Component/Routing b/3rdparty/Symfony/Component/Routing deleted file mode 160000 -Subproject d72483890880a987afa679503af096d2aaf7d2e diff --git a/composer.json b/composer.json new file mode 100644 index 00000000000..628ee601103 --- /dev/null +++ b/composer.json @@ -0,0 +1,8 @@ +{ + "require": { + "symfony/routing": "2.0.*" + }, + "config": { + "vendor-dir": "3rdparty" + } +} diff --git a/lib/base.php b/lib/base.php index c8a54d1c659..c688d785339 100644 --- a/lib/base.php +++ b/lib/base.php @@ -97,8 +97,8 @@ class OC{ elseif(strpos($className, 'Sabre_')===0) { $path = str_replace('_', '/', $className) . '.php'; } - elseif(strpos($className, 'Symfony\\')===0) { - $path = str_replace('\\', '/', $className) . '.php'; + elseif(strpos($className, 'Symfony\\Component\\Routing\\')===0) { + $path = 'symfony/routing/'.str_replace('\\', '/', $className) . '.php'; } elseif(strpos($className, 'Test_')===0) { $path = 'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php'); |