Merge pull request #156 from owncloud/update-symphony-components

Update symphony components
owncloud-archive · Mar 10, 2015 · 7c53615 · 7c53615
2 parents d849ddf + 4d9ff28
commit 7c53615
Show file tree

Hide file tree

Showing 251 changed files with 4,753 additions and 13,163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,16 @@ symfony/console/Symfony/Component/Console/composer.json
 symfony/routing/Symfony/Component/Routing/Tests/
 symfony/routing/Symfony/Component/Routing/phpunit.xml.dist
 symfony/routing/Symfony/Component/Routing/.gitignore
+symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/
+
+symfony/event-dispatcher/Symfony/EventDispatcher/Debug/Routing/Tests/
+symfony/event-dispatcher/Symfony/EventDispatcher/Debug/phpunit.xml.dist
+symfony/event-dispatcher/Symfony/EventDispatcher/Debug/.gitignore
+
+symfony/process/Symfony/Component/Process/Routing/Tests/
+symfony/process/Symfony/Component/Process/phpunit.xml.dist
+symfony/process/Symfony/Component/Process/Tests
+symfony/process/Symfony/Component/Process/.gitignore
 
 pimple/pimple/ext
 pimple/pimple/.gitignore

diff --git a/autoload.php b/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042::getLoader();
+return ComposerAutoloaderInit45518c348c80881aa936caecc452b13e::getLoader();
diff --git a/composer.json b/composer.json
@@ -37,8 +37,10 @@
 		"pear/archive_tar": "1.3.13",
 		"pear/pear_exception": "1.0.*@dev",
 		"patchwork/utf8": "~1.1",
-		"symfony/console": "~2.5",
-		"symfony/routing": "~2.5",
+		"symfony/console": "2.6.4",
+		"symfony/event-dispatcher": "2.6.4",
+		"symfony/routing": "2.6.4",
+		"symfony/process": "2.6.4",
 		"pimple/pimple": "~3.0",
 		"ircmaxell/password-compat": "1.0.*",
 		"nikic/php-parser": "~1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042
+class ComposerAutoloaderInit45518c348c80881aa936caecc452b13e
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit45518c348c80881aa936caecc452b13e', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit45518c348c80881aa936caecc452b13e', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequire534f628906b03cd0188ec46eb2dc1042($file);
+            composerRequire45518c348c80881aa936caecc452b13e($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire534f628906b03cd0188ec46eb2dc1042($file)
+function composerRequire45518c348c80881aa936caecc452b13e($file)
 {
     require $file;
 }