Issue #2161397 by dawehner, tim.plunkett, Crell: Update to Symfony 2.4.1.

8b0cb059 · webchick · bb05d952 · 8b0cb059 · 8b0cb059 · 8b0cb059
Commit 8b0cb059 authored Jan 21, 2014 by webchick
--- a/composer.json
+++ b/composer.json
@@ -5,15 +5,15 @@
  "license": "GPL-2.0+",
  "require": {
    "sdboyer/gliph": "0.1.*",
-    "symfony/class-loader": "2.3.*",
-    "symfony/dependency-injection": "2.3.*",
-    "symfony/event-dispatcher": "2.3.*",
-    "symfony/http-foundation": "2.3.*",
-    "symfony/http-kernel": "2.3.*",
-    "symfony/routing": "2.3.*",
-    "symfony/serializer": "2.3.*",
-    "symfony/validator": "2.3.*",
-    "symfony/yaml": "2.3.*",
+    "symfony/class-loader": "2.4.*",
+    "symfony/dependency-injection": "2.4.*",
+    "symfony/event-dispatcher": "2.4.*",
+    "symfony/http-foundation": "2.4.*",
+    "symfony/http-kernel": "2.4.*",
+    "symfony/routing": "2.4.*",
+    "symfony/serializer": "2.4.*",
+    "symfony/validator": "2.4.*",
+    "symfony/yaml": "2.4.*",
    "twig/twig": "1.15.*",
    "doctrine/common": "dev-master#a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
    "doctrine/annotations": "dev-master#463d926a8dcc49271cb7db5a08364a70ed6e3cd3",

--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
        "This file locks the dependencies of your project to a known state",
        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
    ],
-    "hash": "f6456b9e0dbaab50041a3766d73c954e",
+    "hash": "ac2a8ee2f49fcb0535259847306a2bdc",
    "packages": [
        {
            "name": "doctrine/annotations",
@@ -1220,17 +1220,17 @@
        },
        {
            "name": "symfony/class-loader",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/ClassLoader",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/ClassLoader.git",
-                "reference": "622d370a07321329f5259c6f96d5c636104ad46b"
+                "reference": "6a2ebedbc780130f07b3a15363743d08eb46820c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/622d370a07321329f5259c6f96d5c636104ad46b",
-                "reference": "622d370a07321329f5259c6f96d5c636104ad46b",
+                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/6a2ebedbc780130f07b3a15363743d08eb46820c",
+                "reference": "6a2ebedbc780130f07b3a15363743d08eb46820c",
                "shasum": ""
            },
            "require": {
@@ -1242,7 +1242,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1266,7 +1266,7 @@
            ],
            "description": "Symfony ClassLoader Component",
            "homepage": "http://symfony.com",
-            "time": "2013-08-13 20:18:00"
+            "time": "2013-11-26 16:40:27"
        },
        {
            "name": "symfony/debug",
@@ -1326,17 +1326,17 @@
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/DependencyInjection",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "3678aa969e5bfeb8515a1f3047c63e8104723f5c"
+                "reference": "7e5bde3a607dde1f8ddef5180759068ad53d259c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/3678aa969e5bfeb8515a1f3047c63e8104723f5c",
-                "reference": "3678aa969e5bfeb8515a1f3047c63e8104723f5c",
+                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/7e5bde3a607dde1f8ddef5180759068ad53d259c",
+                "reference": "7e5bde3a607dde1f8ddef5180759068ad53d259c",
                "shasum": ""
            },
            "require": {
@@ -1344,6 +1344,7 @@
            },
            "require-dev": {
                "symfony/config": "~2.2",
+                "symfony/expression-language": "~2.4",
                "symfony/yaml": "~2.0"
            },
            "suggest": {
@@ -1354,7 +1355,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1378,21 +1379,21 @@
            ],
            "description": "Symfony DependencyInjection Component",
            "homepage": "http://symfony.com",
-            "time": "2013-07-25 17:13:25"
+            "time": "2014-01-01 09:02:49"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/EventDispatcher",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8"
+                "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8",
-                "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e3ba42f6a70554ed05749e61b829550f6ac33601",
+                "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601",
                "shasum": ""
            },
            "require": {
@@ -1408,7 +1409,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1432,21 +1433,21 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "http://symfony.com",
-            "time": "2013-07-21 12:12:18"
+            "time": "2013-12-28 08:12:03"
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/HttpFoundation",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "fdf130fe65457aedbc4639a22f4ef9d3be5c002c"
+                "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/fdf130fe65457aedbc4639a22f4ef9d3be5c002c",
-                "reference": "fdf130fe65457aedbc4639a22f4ef9d3be5c002c",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
+                "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
                "shasum": ""
            },
            "require": {
@@ -1455,7 +1456,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1482,21 +1483,21 @@
            ],
            "description": "Symfony HttpFoundation Component",
            "homepage": "http://symfony.com",
-            "time": "2013-08-26 05:49:51"
+            "time": "2014-01-05 02:10:50"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/HttpKernel",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "9d35da40f07bbe7a4f8dfbc41555d2b69de674bf"
+                "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/9d35da40f07bbe7a4f8dfbc41555d2b69de674bf",
-                "reference": "9d35da40f07bbe7a4f8dfbc41555d2b69de674bf",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0605eedeb52c4d3a3144128d8336395a57be60d4",
+                "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4",
                "shasum": ""
            },
            "require": {
@@ -1504,7 +1505,7 @@
                "psr/log": "~1.0",
                "symfony/debug": "~2.3",
                "symfony/event-dispatcher": "~2.1",
-                "symfony/http-foundation": "~2.2"
+                "symfony/http-foundation": "~2.4"
            },
            "require-dev": {
                "symfony/browser-kit": "~2.2",
@@ -1529,7 +1530,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1553,7 +1554,7 @@
            ],
            "description": "Symfony HttpKernel Component",
            "homepage": "http://symfony.com",
-            "time": "2013-08-27 08:58:24"
+            "time": "2014-01-05 02:12:11"
        },
        {
            "name": "symfony/process",
@@ -1602,39 +1603,99 @@
            "homepage": "http://symfony.com",
            "time": "2013-08-22 06:42:25"
        },
+        {
+            "name": "symfony/property-access",
+            "version": "v2.4.1",
+            "target-dir": "Symfony/Component/PropertyAccess",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/PropertyAccess.git",
+                "reference": "274951234150e303c83099a2429be6be35629fe9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/274951234150e303c83099a2429be6be35629fe9",
+                "reference": "274951234150e303c83099a2429be6be35629fe9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\PropertyAccess\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony PropertyAccess Component",
+            "homepage": "http://symfony.com",
+            "keywords": [
+                "access",
+                "array",
+                "extraction",
+                "index",
+                "injection",
+                "object",
+                "property",
+                "property path",
+                "reflection"
+            ],
+            "time": "2013-11-13 21:30:16"
+        },
        {
            "name": "symfony/routing",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/Routing",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Routing.git",
-                "reference": "69af3f07dbf3ae93dd513dbc373f561cb2e7f143"
+                "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/69af3f07dbf3ae93dd513dbc373f561cb2e7f143",
-                "reference": "69af3f07dbf3ae93dd513dbc373f561cb2e7f143",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/4abfb500aab8be458c9e3a227ea56b190584f78a",
+                "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
            "require-dev": {
-                "doctrine/common": "~2.2",
+                "doctrine/annotations": "~1.0",
                "psr/log": "~1.0",
                "symfony/config": "~2.2",
+                "symfony/expression-language": "~2.4",
                "symfony/yaml": "~2.0"
            },
            "suggest": {
-                "doctrine/common": "",
-                "symfony/config": "",
-                "symfony/yaml": ""
+                "doctrine/annotations": "For using the annotation loader",
+                "symfony/config": "For using the all-in-one router or any loader",
+                "symfony/expression-language": "For using expression matching",
+                "symfony/yaml": "For using the YAML loader"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1658,21 +1719,27 @@
            ],
            "description": "Symfony Routing Component",
            "homepage": "http://symfony.com",
-            "time": "2013-08-23 15:14:07"
+            "keywords": [
+                "router",
+                "routing",
+                "uri",
+                "url"
+            ],
+            "time": "2014-01-05 02:10:50"
        },
        {
            "name": "symfony/serializer",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/Serializer",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Serializer.git",
-                "reference": "457ba76395955926a67ea692957b0872dead5278"
+                "reference": "60c54346958604379392672a3a998650a169a7f4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Serializer/zipball/457ba76395955926a67ea692957b0872dead5278",
-                "reference": "457ba76395955926a67ea692957b0872dead5278",
+                "url": "https://api.github.com/repos/symfony/Serializer/zipball/60c54346958604379392672a3a998650a169a7f4",
+                "reference": "60c54346958604379392672a3a998650a169a7f4",
                "shasum": ""
            },
            "require": {
@@ -1681,7 +1748,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1705,7 +1772,7 @@
            ],
            "description": "Symfony Serializer Component",
            "homepage": "http://symfony.com",
-            "time": "2013-07-21 12:12:18"
+            "time": "2014-01-01 08:14:50"
        },
        {
            "name": "symfony/translation",
@@ -1764,31 +1831,35 @@
        },
        {
            "name": "symfony/validator",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/Validator",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Validator.git",
-                "reference": "8f6f6be47fb8e1179cd225b1f949630e26221e42"
+                "reference": "7ea4e53f8d68bf3ae9cca28765d49d7930618730"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Validator/zipball/8f6f6be47fb8e1179cd225b1f949630e26221e42",
-                "reference": "8f6f6be47fb8e1179cd225b1f949630e26221e42",
+                "url": "https://api.github.com/repos/symfony/Validator/zipball/7ea4e53f8d68bf3ae9cca28765d49d7930618730",
+                "reference": "7ea4e53f8d68bf3ae9cca28765d49d7930618730",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3",
+                "symfony/property-access": "~2.2",
                "symfony/translation": "~2.0"
            },
            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/cache": "~1.0",
                "symfony/config": "~2.2",
                "symfony/http-foundation": "~2.1",
                "symfony/intl": "~2.3",
                "symfony/yaml": "~2.0"
            },
            "suggest": {
-                "doctrine/common": "",
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader",
                "symfony/config": "",
                "symfony/http-foundation": "",
                "symfony/intl": "",
@@ -1797,7 +1868,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1821,21 +1892,21 @@
            ],
            "description": "Symfony Validator Component",
            "homepage": "http://symfony.com",
-            "time": "2013-08-24 15:26:22"
+            "time": "2014-01-01 08:14:50"
        },
        {
            "name": "symfony/yaml",
-            "version": "v2.3.4",
+            "version": "v2.4.1",
            "target-dir": "Symfony/Component/Yaml",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
+                "reference": "4e1a237fc48145fae114b96458d799746ad89aa0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
-                "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/4e1a237fc48145fae114b96458d799746ad89aa0",
+                "reference": "4e1a237fc48145fae114b96458d799746ad89aa0",
                "shasum": ""
            },
            "require": {
@@ -1844,7 +1915,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -1868,7 +1939,7 @@
            ],
            "description": "Symfony Yaml Component",
            "homepage": "http://symfony.com",
-            "time": "2013-08-24 15:26:22"
+            "time": "2013-12-28 08:12:03"
        },
        {
            "name": "twig/twig",

--- a/core/modules/language/lib/Drupal/language/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
@@ -162,7 +162,7 @@ public function processOutbound($path, &$options = array(), Request $request = N
          list(, $port) = explode(':', $normalized_base_url);
          $options['base_url'] .= ':' . $port;
        }
-        elseif ($port != 80) {
+        elseif (($url_scheme == 'http' && $port != 80) || ($url_scheme == 'https' && $port != 443)) {
          $options['base_url'] .= ':' . $port;
        }


--- a/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php
@@ -124,7 +124,9 @@ function testDomainNameNegotiationPort() {
    // URLs as well.
    $index_php = strpos(url('', array('absolute' => TRUE)), 'index.php') !== FALSE;

-    $request = $this->prepareRequestForGenerator(TRUE, array('SERVER_PORT' => '88'));
+    $request = Request::createFromGlobals();
+    $server = $request->server->all();
+    $request = $this->prepareRequestForGenerator(TRUE, array('HTTP_HOST' => $server['HTTP_HOST'] . ':88'));

    // Create an absolute French link.
    $language = language_load('fr');

--- a/core/vendor/autoload.php
+++ b/core/vendor/autoload.php
@@ -4,4 +4,4 @@

 require_once __DIR__ . '/composer' . '/autoload_real.php';

-return ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111::getLoader();
+return ComposerAutoloaderInit8448fbbf88ecb044f224057d631a4472::getLoader();
--- a/core/vendor/composer/autoload_namespaces.php
+++ b/core/vendor/composer/autoload_namespaces.php
@@ -15,6 +15,7 @@
    'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
    'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
    'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
+    'Symfony\\Component\\PropertyAccess\\' => array($vendorDir . '/symfony/property-access'),
    'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
    'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
    'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),

--- a/core/vendor/composer/autoload_real.php
+++ b/core/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@

 // autoload_real.php @generated by Composer

-class ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111
+class ComposerAutoloaderInit8448fbbf88ecb044f224057d631a4472
 {
    private static $loader;

@@ -19,9 +19,9 @@ public static function getLoader()
            return self::$loader;
        }

-        spl_autoload_register(array('ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit8448fbbf88ecb044f224057d631a4472', 'loadClassLoader'), true, true);
        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit8448fbbf88ecb044f224057d631a4472', 'loadClassLoader'));

        $vendorDir = dirname(__DIR__);
        $baseDir = dirname(dirname($vendorDir));

--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/CHANGELOG.md
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/CHANGELOG.md
 CHANGELOG
 =========

+2.4.0
+-----
+
+ * deprecated the DebugClassLoader as it has been moved to the Debug component instead
+
 2.3.0
 -----


--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -53,7 +53,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
            $classes = array_diff($classes, $declared);

            // the cache is different depending on which classes are already declared
-            $name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5);
+            $name = $name.'-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
        }

        $classes = array_unique($classes);

--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -39,7 +39,7 @@ public static function dump($dirs, $file)
    /**
     * Iterate over all files in the given directory searching for classes
     *
-     * @param Iterator|string $dir The directory to search in or an iterator
+     * @param \Iterator|string $dir The directory to search in or an iterator
     *
     * @return array A class map array
     */

--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -22,6 +22,8 @@
 * @author Christophe Coevoet <stof@notk.org>
 *
 * @api
+ *
+ * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
 */
 class DebugClassLoader
 {
@@ -39,6 +41,16 @@ public function __construct($classFinder)
        $this->classFinder = $classFinder;
    }

+    /**
+     * Gets the wrapped class loader.
+     *
+     * @return object a class loader instance
+     */
+    public function getClassLoader()
+    {
+        return $this->classFinder;
+    }
+
    /**
     * Replaces all autoloaders implementing a findFile method by a DebugClassLoader wrapper.
     */

--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
@@ -65,5 +65,5 @@ Resources
 You can run the unit tests with the following command:

    $ cd path/to/Symfony/Component/ClassLoader/
-    $ composer.phar install --dev
+    $ composer.phar install
    $ phpunit
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
@@ -189,7 +189,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testUnableToLoadClassException()
    {

--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
@@ -72,7 +72,7 @@ public function testLoadNonexistentClass($className, $testClassName, $message)
    public function getLoadNonexistentClassTests()
    {
        return array(
-            array('\\Pearlike3_Bar', '\\Pearlike3_Bar', '->loadClass() loads non exising Pearlike3_Bar class with a leading slash'),
+            array('\\Pearlike3_Bar', '\\Pearlike3_Bar', '->loadClass() loads non existing Pearlike3_Bar class with a leading slash'),
        );
    }


--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -120,10 +120,6 @@ public function getTestCreateMapTests()