Issue #1894002 by scor, msonnabaum, effulgentsia: Update vendor libraries and...

Issue #1894002 by scor, msonnabaum, effulgentsia: Update vendor libraries and pin them to specific versions in composer.json.

Issue #1894002 by scor, msonnabaum, effulgentsia: Update vendor libraries and...
Issue #1894002 by scor, msonnabaum, effulgentsia: Update vendor libraries and pin them to specific versions in composer.json.
b726e434 · catch · d29b1303 · b726e434 · b726e434 · b726e434
Commit b726e434 authored Feb 06, 2013 by catch
--- a/core/composer.json
+++ b/core/composer.json
@@ -3,21 +3,21 @@
  "description": "Drupal is an open source content management platform powering millions of websites and applications.",
  "license": "GPL-2.0+",
  "require": {
-    "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/class-loader": "2.2.0-BETA2",
+    "symfony/dependency-injection": "2.2.0-BETA2",
+    "symfony/event-dispatcher": "2.2.0-BETA2",
+    "symfony/http-foundation": "2.2.0-BETA2",
+    "symfony/http-kernel": "2.2.0-BETA2",
+    "symfony/routing": "2.2.0-BETA2",
    "symfony/serializer": "2.2.0-BETA2",
-    "symfony/validator": "<2.4",
-    "symfony/yaml": "<2.4",
-    "twig/twig": "1.*@stable",
-    "doctrine/common": "2.3.*@stable",
-    "guzzle/http": "3.1.*@stable",
-    "kriswallsmith/assetic": "1.1.*@alpha",
+    "symfony/validator": "2.2.0-BETA2",
+    "symfony/yaml": "2.2.0-BETA2",
+    "twig/twig": "1.12.1",
+    "doctrine/common": "2.3.0",
+    "guzzle/http": "3.1.0",
+    "kriswallsmith/assetic": "1.1.0-alpha1",
    "symfony-cmf/routing": "dev-master#ea4a10",
-    "easyrdf/easyrdf": "dev-master"
+    "easyrdf/easyrdf": "0.8.0-beta.1"
  },
  "minimum-stability": "dev"
 }
--- a/core/composer.lock
+++ b/core/composer.lock
 {
-    "hash": "c087560024f328e26e2ed57c9b2aa703",
+    "hash": "ab5b183002f04155958ac5b57ed29032",
    "packages": [
        {
            "name": "doctrine/common",
@@ -56,7 +56,7 @@
                {
                    "name": "Johannes Schmitt",
                    "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                    "role": "Developer of wrapped JMSSerializerBundle"
                }
            ],
@@ -72,16 +72,16 @@
        },
        {
            "name": "easyrdf/easyrdf",
-            "version": "dev-master",
+            "version": "0.8.0-beta.1",
            "source": {
                "type": "git",
                "url": "git://github.com/njh/easyrdf.git",
-                "reference": "d1c363bd04cd55169fbefe52328e86031c6db3a2"
+                "reference": "0.8.0-beta.1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/njh/easyrdf/archive/d1c363bd04cd55169fbefe52328e86031c6db3a2.zip",
-                "reference": "d1c363bd04cd55169fbefe52328e86031c6db3a2",
+                "url": "https://github.com/njh/easyrdf/archive/0.8.0-beta.1.zip",
+                "reference": "0.8.0-beta.1",
                "shasum": ""
            },
            "require": {
@@ -95,7 +95,7 @@
                "squizlabs/php_codesniffer": ">=1.4.3",
                "sami/sami": "dev-master"
            },
-            "time": "2013-01-13 01:20:04",
+            "time": "2013-01-18 15:54:28",
            "type": "library",
            "autoload": {
                "psr-0": {
@@ -378,6 +378,44 @@
                "minification"
            ]
        },
+        {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log",
+                "reference": "1.0.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/php-fig/log/archive/1.0.0.zip",
+                "reference": "1.0.0",
+                "shasum": ""
+            },
+            "time": "2012-12-21 11:40:51",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ]
+        },
        {
            "name": "symfony-cmf/routing",
            "version": "dev-master",
@@ -389,7 +427,7 @@
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony-cmf/Routing/archive/ea4a10dd971580a9a57a69397f165e25233ba667.zip",
+                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/72df1da07b3c4edf16df169fb7987f504070fe0d",
                "reference": "ea4a10",
                "shasum": ""
            },
@@ -429,17 +467,17 @@
        },
        {
            "name": "symfony/class-loader",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/ClassLoader",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/ClassLoader",
-                "reference": "0730d0f8f99cfeafbc23271f1e87f54da15f1e06"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/ClassLoader/archive/0730d0f8f99cfeafbc23271f1e87f54da15f1e06.zip",
-                "reference": "0730d0f8f99cfeafbc23271f1e87f54da15f1e06",
+                "url": "https://github.com/symfony/ClassLoader/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
@@ -448,7 +486,7 @@
            "require-dev": {
                "symfony/finder": "2.2.*"
            },
-            "time": "2013-01-04 16:58:00",
+            "time": "2013-01-23 20:21:00",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -479,17 +517,17 @@
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/DependencyInjection",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/DependencyInjection",
-                "reference": "13b47742e1ef22aed78132e5e0930d28571142a4"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/DependencyInjection/archive/13b47742e1ef22aed78132e5e0930d28571142a4.zip",
-                "reference": "13b47742e1ef22aed78132e5e0930d28571142a4",
+                "url": "https://github.com/symfony/DependencyInjection/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
@@ -503,7 +541,7 @@
                "symfony/yaml": "2.2.*",
                "symfony/config": "2.2.*"
            },
-            "time": "2013-01-04 16:58:00",
+            "time": "2013-01-23 20:21:00",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -534,17 +572,17 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/EventDispatcher",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/EventDispatcher",
-                "reference": "0fcc9fa82fa3ea7ec2605af2e8137698fbaca3dc"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/EventDispatcher/archive/0fcc9fa82fa3ea7ec2605af2e8137698fbaca3dc.zip",
-                "reference": "0fcc9fa82fa3ea7ec2605af2e8137698fbaca3dc",
+                "url": "https://github.com/symfony/EventDispatcher/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
@@ -557,7 +595,7 @@
                "symfony/dependency-injection": "2.2.*",
                "symfony/http-kernel": "2.2.*"
            },
-            "time": "2013-01-04 17:02:19",
+            "time": "2013-01-17 15:25:59",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -588,23 +626,23 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/HttpFoundation",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/HttpFoundation",
-                "reference": "5aa0119417f1fc8de7513d9432dd2f43f9d9e97b"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/HttpFoundation/archive/5aa0119417f1fc8de7513d9432dd2f43f9d9e97b.zip",
-                "reference": "5aa0119417f1fc8de7513d9432dd2f43f9d9e97b",
+                "url": "https://github.com/symfony/HttpFoundation/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "time": "2013-01-04 17:02:19",
+            "time": "2013-01-21 16:56:55",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -638,23 +676,24 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/HttpKernel",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/HttpKernel",
-                "reference": "ce164c088666b80ffc116173065d504055414137"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/HttpKernel/archive/ce164c088666b80ffc116173065d504055414137.zip",
-                "reference": "ce164c088666b80ffc116173065d504055414137",
+                "url": "https://github.com/symfony/HttpKernel/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3",
                "symfony/event-dispatcher": "2.2.*",
-                "symfony/http-foundation": "2.2.*"
+                "symfony/http-foundation": "2.2.*",
+                "psr/log": ">=1.0,<2.0"
            },
            "require-dev": {
                "symfony/browser-kit": "2.2.*",
@@ -675,7 +714,7 @@
                "symfony/dependency-injection": "2.2.*",
                "symfony/finder": "2.2.*"
            },
-            "time": "2013-01-04 16:58:00",
+            "time": "2013-01-24 07:15:19",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -711,18 +750,18 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Process",
-                "reference": "058ae5038a9623fa64b120a2d10ba81f1ade05c7"
+                "reference": "v2.1.7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/Process/archive/058ae5038a9623fa64b120a2d10ba81f1ade05c7.zip",
-                "reference": "058ae5038a9623fa64b120a2d10ba81f1ade05c7",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.7",
+                "reference": "v2.1.7",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "time": "2012-12-06 10:00:55",
+            "time": "2013-01-16 09:27:54",
            "type": "library",
            "autoload": {
                "psr-0": {
@@ -748,34 +787,35 @@
        },
        {
            "name": "symfony/routing",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/Routing",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Routing",
-                "reference": "87a66890450658ccac99702ac5e4f002ece9e23e"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/Routing/archive/87a66890450658ccac99702ac5e4f002ece9e23e.zip",
-                "reference": "87a66890450658ccac99702ac5e4f002ece9e23e",
+                "url": "https://github.com/symfony/Routing/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
            "require-dev": {
-                "doctrine/common": ">=2.2,<2.4-dev",
                "symfony/config": "2.2.*",
                "symfony/yaml": "2.2.*",
-                "symfony/http-kernel": "2.2.*"
+                "symfony/http-kernel": "2.2.*",
+                "doctrine/common": ">=2.2,<2.4-dev",
+                "psr/log": ">=1.0,<2.0"
            },
            "suggest": {
-                "doctrine/common": ">=2.2,<2.4-dev",
                "symfony/config": "2.2.*",
-                "symfony/yaml": "2.2.*"
+                "symfony/yaml": "2.2.*",
+                "doctrine/common": ">=2.2,<2.4-dev"
            },
-            "time": "2012-12-28 13:21:48",
+            "time": "2013-01-21 16:57:32",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -853,7 +893,7 @@
        },
        {
            "name": "symfony/translation",
-            "version": "dev-master",
+            "version": "2.2.x-dev",
            "target-dir": "Symfony/Component/Translation",
            "source": {
                "type": "git",
@@ -862,7 +902,7 @@
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/Translation/archive/v2.2.0-BETA2.zip",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.0-BETA2",
                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
@@ -908,17 +948,17 @@
        },
        {
            "name": "symfony/validator",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/Validator",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Validator",
-                "reference": "f764b2e61c51c45f93bd4c9fe933e6a66928d2d3"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/Validator/archive/f764b2e61c51c45f93bd4c9fe933e6a66928d2d3.zip",
-                "reference": "f764b2e61c51c45f93bd4c9fe933e6a66928d2d3",
+                "url": "https://github.com/symfony/Validator/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
@@ -937,7 +977,7 @@
                "symfony/yaml": "2.2.*",
                "symfony/config": "2.2.*"
            },
-            "time": "2013-01-24 10:00:40",
+            "time": "2013-01-21 16:57:12",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -968,23 +1008,23 @@
        },
        {
            "name": "symfony/yaml",
-            "version": "dev-master",
+            "version": "v2.2.0-BETA2",
            "target-dir": "Symfony/Component/Yaml",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/Yaml",
-                "reference": "365b4df7802b9bb93084d2cc9a51fe88b488f956"
+                "reference": "v2.2.0-BETA2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/symfony/Yaml/archive/365b4df7802b9bb93084d2cc9a51fe88b488f956.zip",
-                "reference": "365b4df7802b9bb93084d2cc9a51fe88b488f956",
+                "url": "https://github.com/symfony/Yaml/archive/v2.2.0-BETA2.zip",
+                "reference": "v2.2.0-BETA2",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "time": "2012-12-19 07:09:49",
+            "time": "2013-01-23 20:21:00",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -1015,26 +1055,26 @@
        },
        {
            "name": "twig/twig",
-            "version": "v1.11.1",
+            "version": "v1.12.1",
            "source": {
                "type": "git",
                "url": "git://github.com/fabpot/Twig.git",
-                "reference": "v1.11.1"
+                "reference": "v1.12.1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/fabpot/Twig/archive/v1.11.1.zip",
-                "reference": "v1.11.1",
+                "url": "https://github.com/fabpot/Twig/archive/v1.12.1.zip",
+                "reference": "v1.12.1",
                "shasum": ""
            },
            "require": {
                "php": ">=5.2.4"
            },
-            "time": "2012-11-11 17:17:59",
+            "time": "2013-01-15 20:03:52",
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@@ -1069,12 +1109,17 @@
    ],
    "minimum-stability": "dev",
    "stability-flags": {
+        "symfony/class-loader": 10,
+        "symfony/dependency-injection": 10,
+        "symfony/event-dispatcher": 10,
+        "symfony/http-foundation": 10,
+        "symfony/http-kernel": 10,
+        "symfony/routing": 10,
        "symfony/serializer": 10,
-        "twig/twig": 0,
-        "doctrine/common": 0,
-        "guzzle/http": 0,
+        "symfony/validator": 10,
+        "symfony/yaml": 10,
        "kriswallsmith/assetic": 15,
        "symfony-cmf/routing": 20,
-        "easyrdf/easyrdf": 20
+        "easyrdf/easyrdf": 10
    }
 }
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -118,8 +118,7 @@ public function build(ContainerBuilder $container) {
    // object and get reconstructed when the request object changes (e.g.,
    // during a subrequest).
    $container->addScope(new Scope('request'));
-    $container->register('request', 'Symfony\Component\HttpFoundation\Request')
-      ->setSynthetic(TRUE);
+    $container->register('request', 'Symfony\Component\HttpFoundation\Request');

    $container->register('event_dispatcher', 'Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher')
      ->addArgument(new Reference('service_container'));

--- a/core/lib/Drupal/Core/Routing/CompiledRoute.php
+++ b/core/lib/Drupal/Core/Routing/CompiledRoute.php
@@ -67,17 +67,17 @@ class CompiledRoute extends SymfonyCompiledRoute {
   *   An array of tokens to use to generate URL for this route
   * @param array $pathVariables
   *   An array of path variables
-   * @param string|null $hostnameRegex
-   *   Hostname regex
-   * @param array $hostnameTokens
-   *   Hostname tokens
-   * @param array $hostnameVariables
-   *   An array of hostname variables
+   * @param string|null $hostRegex
+   *   Host regex
+   * @param array $hostTokens
+   *   Host tokens
+   * @param array $hostVariables
+   *   An array of host variables
   * @param array $variables
-   *   An array of variables (variables defined in the path and in the hostname patterns)
+   *   An array of variables (variables defined in the path and in the host patterns)
   */
-  public function __construct(Route $route, $fit, $pattern_outline, $num_parts, $staticPrefix, $regex, array $tokens, array $pathVariables, $hostnameRegex = null, array $hostnameTokens = array(), array $hostnameVariables = array(), array $variables = array()) {
-    parent::__construct($staticPrefix, $regex, $tokens, $pathVariables, $hostnameRegex, $hostnameTokens, $hostnameVariables, $variables);
+  public function __construct(Route $route, $fit, $pattern_outline, $num_parts, $staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = null, array $hostTokens = array(), array $hostVariables = array(), array $variables = array()) {
+    parent::__construct($staticPrefix, $regex, $tokens, $pathVariables, $hostRegex, $hostTokens, $hostVariables, $variables);

    $this->route = $route;
    $this->fit = $fit;

--- a/core/lib/Drupal/Core/Routing/RouteCompiler.php
+++ b/core/lib/Drupal/Core/Routing/RouteCompiler.php
@@ -40,14 +40,14 @@ class RouteCompiler extends SymfonyRouteCompiler implements RouteCompilerInterfa
   * @return \Drupal\Core\Routing\CompiledRoute
   *   A CompiledRoute instance.
   */
-  public function compile(Route $route) {
+  public static function compile(Route $route) {

    $symfony_compiled = parent::compile($route);

    // The Drupal-specific compiled information.
-    $stripped_path = $this->getPathWithoutDefaults($route);
-    $fit = $this->getFit($stripped_path);
-    $pattern_outline = $this->getPatternOutline($stripped_path);
+    $stripped_path = static::getPathWithoutDefaults($route);
+    $fit = static::getFit($stripped_path);
+    $pattern_outline = static::getPatternOutline($stripped_path);
    $num_parts = count(explode('/', trim($pattern_outline, '/')));

    return new CompiledRoute(
@@ -60,9 +60,9 @@ public function compile(Route $route) {
      $symfony_compiled->getRegex(),
      $symfony_compiled->getTokens(),
      $symfony_compiled->getPathVariables(),
-      $symfony_compiled->getHostnameRegex(),
-      $symfony_compiled->getHostnameTokens(),
-      $symfony_compiled->getHostnameVariables(),
+      $symfony_compiled->getHostRegex(),
+      $symfony_compiled->getHostTokens(),
+      $symfony_compiled->getHostVariables(),
      $symfony_compiled->getVariables()
      );
  }
@@ -79,7 +79,7 @@ public function compile(Route $route) {
   * @return string
   *   The path pattern outline.
   */
-  public function getPatternOutline($path) {
+  public static function getPatternOutline($path) {
    return preg_replace('#\{\w+\}#', '%', $path);
  }

@@ -92,7 +92,7 @@ public function getPatternOutline($path) {
   * @return int
   *   The fitness of the path, as an integer.
   */
-  public function getFit($path) {
+  public static function getFit($path) {
    $parts = explode('/', trim($path, '/'), static::MAX_PARTS);
    $number_parts = count($parts);
    // We store the highest index of parts here to save some work in the fit
@@ -124,7 +124,7 @@ public function getFit($path) {
   * @return string
   *   The path string, stripped of placeholders that have default values.
   */
-  protected function getPathWithoutDefaults(Route $route) {
+  protected static function getPathWithoutDefaults(Route $route) {
    $path = $route->getPattern();
    $defaults = $route->getDefaults();


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

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

-return ComposerAutoloaderInit4166b4dc5e0c1c9d89ac8e8f9eefcd74::getLoader();
+return ComposerAutoloaderInitf05567eba27abe19ce0204f90ff18248::getLoader();
--- a/core/vendor/composer/autoload_namespaces.php
+++ b/core/vendor/composer/autoload_namespaces.php
@@ -19,6 +19,7 @@
    'Symfony\\Component\\DependencyInjection\\' => $vendorDir . '/symfony/dependency-injection/',
    'Symfony\\Component\\ClassLoader\\' => $vendorDir . '/symfony/class-loader/',
    'Symfony\\Cmf\\Component\\Routing' => $vendorDir . '/symfony-cmf/routing/',
+    'Psr\\Log\\' => $vendorDir . '/psr/log/',
    'Guzzle\\Stream' => $vendorDir . '/guzzle/stream/',
    'Guzzle\\Parser' => $vendorDir . '/guzzle/parser/',
    'Guzzle\\Http' => $vendorDir . '/guzzle/http/',

--- 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 ComposerAutoloaderInit4166b4dc5e0c1c9d89ac8e8f9eefcd74
+class ComposerAutoloaderInitf05567eba27abe19ce0204f90ff18248
 {
    private static $loader;

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

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

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

--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
--- a/core/vendor/easyrdf/easyrdf/.gitignore
+++ b/core/vendor/easyrdf/easyrdf/.gitignore
-doap.rdf
-docs
-samicache
-lib/arc/
-reports
-*.tar.gz
-vendor
-composer.phar
-composer.lock
--- a/core/vendor/easyrdf/easyrdf/Makefile
+++ b/core/vendor/easyrdf/easyrdf/Makefile
-PACKAGE = easyrdf
-VERSION = $(shell php -r "print json_decode(file_get_contents('composer.json'))->version;")
-distdir = $(PACKAGE)-$(VERSION)
-PHP = $(shell which php)
-COMPOSER_FLAGS=--no-ansi --no-interaction
-PHPUNIT = vendor/bin/phpunit 
-PHPUNIT_FLAGS = -c config/phpunit.xml
-PHPCS = vendor/bin/phpcs
-PHPCS_FLAGS = --standard=./config/phpcs_ruleset.xml --encoding=utf8 --extensions=php
-SAMI = vendor/bin/sami.php
-