From 43e8293d9ce92b42f2dd944847c7e4d8d1b17b9f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 27 Oct 2012 11:32:16 +0200
Subject: [PATCH] Change Symfony/Component/Routing from submodule to composer
fetching
---
.gitignore | 4 ++++
.gitmodules | 3 ---
3rdparty/Symfony/Component/Routing | 1 -
composer.json | 8 ++++++++
lib/base.php | 4 ++--
5 files changed, 14 insertions(+), 6 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 3rdparty/Symfony/Component/Routing
create mode 100644 composer.json
diff --git a/.gitignore b/.gitignore
index 4749dea19d..4ae39ed7fa 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 0f4ad58807..0000000000
--- 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
index d724838908..0000000000
--- 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
index 0000000000..628ee60110
--- /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 c8a54d1c65..c688d78533 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');
--
GitLab