Change Symfony/Component/Routing from submodule to composer fetching

remotes/origin/stable5
Bart Visscher 12 years ago
parent a8d0f84829
commit 43e8293d9c
  1. 4
      .gitignore
  2. 3
      .gitmodules
  3. 1
      3rdparty/Symfony/Component/Routing
  4. 8
      composer.json
  5. 4
      lib/base.php

4
.gitignore vendored

@ -54,3 +54,7 @@ nbproject
# WebFinger # WebFinger
.well-known .well-known
/.buildpath /.buildpath
3rdparty/autoload.php
3rdparty/composer/
3rdparty/symfony/
composer.lock

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "3rdparty/Symfony/Component/Routing"]
path = 3rdparty/Symfony/Component/Routing
url = git://github.com/symfony/Routing.git

@ -1 +0,0 @@
Subproject commit d72483890880a987afa679503af096d2aaf7d2ee

@ -0,0 +1,8 @@
{
"require": {
"symfony/routing": "2.0.*"
},
"config": {
"vendor-dir": "3rdparty"
}
}

@ -97,8 +97,8 @@ class OC{
elseif(strpos($className, 'Sabre_')===0) { elseif(strpos($className, 'Sabre_')===0) {
$path = str_replace('_', '/', $className) . '.php'; $path = str_replace('_', '/', $className) . '.php';
} }
elseif(strpos($className, 'Symfony\\')===0) { elseif(strpos($className, 'Symfony\\Component\\Routing\\')===0) {
$path = str_replace('\\', '/', $className) . '.php'; $path = 'symfony/routing/'.str_replace('\\', '/', $className) . '.php';
} }
elseif(strpos($className, 'Test_')===0) { elseif(strpos($className, 'Test_')===0) {
$path = 'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php'); $path = 'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php');

Loading…
Cancel
Save