Browse Source

Change Symfony/Component/Routing from submodule to composer fetching

tags/v5.0.0alpha1
Bart Visscher 11 years ago
parent
commit
43e8293d9c
5 changed files with 14 additions and 6 deletions
  1. 4
    0
      .gitignore
  2. 0
    3
      .gitmodules
  3. 0
    1
      3rdparty/Symfony/Component/Routing
  4. 8
    0
      composer.json
  5. 2
    2
      lib/base.php

+ 4
- 0
.gitignore View File

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

+ 0
- 3
.gitmodules View File

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

+ 0
- 1
3rdparty/Symfony/Component/Routing

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

+ 8
- 0
composer.json View File

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

+ 2
- 2
lib/base.php View File

@@ -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');

Loading…
Cancel
Save