Change Symfony/Component/Routing from submodule to composer fetching

diff --git a/.gitignore b/.gitignore
index 4749dea19dc782532161ee51266e5a02e9b19602..4ae39ed7facd0f80283568f8a39ad1b817cf0abd 100644 (file)
--- 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 (file)
index 0f4ad58..0000000
--- 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 (submodule)
index d724838..0000000
--- a/3rdparty/Symfony/Component/Routing
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d72483890880a987afa679503af096d2aaf7d2ee

diff --git a/composer.json b/composer.json
new file mode 100644 (file)
index 0000000..628ee60
--- /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 c8a54d1c659e571cd1ddbe21be2ad8aadbc9d2b9..c688d78533954a8a3ad8c4eae3011877d036848e 100644 (file)
--- 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');