Skip to content
GitLab
Commit a8068088 authored by Angie Byron's avatar Angie Byron
Browse files

Issue #1834594 by effulgentsia, Rob Loach: Update dependencies (Symfony and... 

Issue #1834594 by effulgentsia, Rob Loach: Update dependencies (Symfony and Twig) follow up fixes for Composer.
parent 97969786
Expand all Hide whitespace changes
Inline Side-by-side
core/composer.json
View file @ a8068088
......@@ -3,18 +3,18 @@
"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@dev",
"symfony/dependency-injection": "<2.4@dev",
"symfony/event-dispatcher": "<2.4@dev",
"symfony/http-foundation": "<2.4@dev",
"symfony/http-kernel": "<2.4@dev",
"symfony/routing": "<2.4@dev",
"symfony/serializer": "<2.4@dev",
"symfony/yaml": "<2.4@dev",
"twig/twig": "1.*",
"doctrine/common": "2.3.*",
"guzzle/http": "3.*",
"kriswallsmith/assetic": "1.1.*"
"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/yaml": "<2.4",
"twig/twig": "1.*@stable",
"doctrine/common": "2.3.*@stable",
"guzzle/http": "*",
"kriswallsmith/assetic": "1.1.*@alpha"
},
"minimum-stability": "alpha"
"minimum-stability": "dev"
}
core/composer.lock
View file @ a8068088
{
"hash": "1a2c52fedf8d9a23498df41568d82ff4",
"hash": "5d17aee0bd24c24563c2c864600fc5bd",
"packages": [
{
"name": "doctrine/common",
......@@ -71,6 +71,182 @@
"persistence"
]
},
{
"name": "guzzle/common",
"version": "dev-master",
"target-dir": "Guzzle/Common",
"source": {
"type": "git",
"url": "git://github.com/guzzle/common.git",
"reference": "23162d56daa85b1ee6f1d73d9b5a5ecda2d70849"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/common/archive/23162d56daa85b1ee6f1d73d9b5a5ecda2d70849.zip",
"reference": "23162d56daa85b1ee6f1d73d9b5a5ecda2d70849",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"symfony/event-dispatcher": ">=2.1"
},
"time": "2012-12-06 02:26:39",
"type": "library",
"installation-source": "source",
"autoload": {
"psr-0": {
"Guzzle\\Common": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Common libraries used by Guzzle",
"homepage": "http://guzzlephp.org/",
"keywords": [
"event",
"exception",
"common",
"collection"
]
},
{
"name": "guzzle/http",
"version": "dev-master",
"target-dir": "Guzzle/Http",
"source": {
"type": "git",
"url": "git://github.com/guzzle/http.git",
"reference": "v3.0.5"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/http/archive/v3.0.5.zip",
"reference": "v3.0.5",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"guzzle/common": "self.version",
"guzzle/parser": "self.version",
"guzzle/stream": "self.version"
},
"time": "2012-11-18 05:28:55",
"type": "library",
"installation-source": "source",
"autoload": {
"psr-0": {
"Guzzle\\Http": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "HTTP libraries used by Guzzle",
"homepage": "http://guzzlephp.org/",
"keywords": [
"curl",
"http",
"http client",
"client",
"Guzzle"
]
},
{
"name": "guzzle/parser",
"version": "dev-master",
"target-dir": "Guzzle/Parser",
"source": {
"type": "git",
"url": "git://github.com/guzzle/parser.git",
"reference": "v3.0.5"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/parser/archive/v3.0.5.zip",
"reference": "v3.0.5",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"time": "2012-11-19 00:07:13",
"type": "library",
"installation-source": "source",
"autoload": {
"psr-0": {
"Guzzle\\Parser": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Interchangeable parsers used by Guzzle",
"homepage": "http://guzzlephp.org/",
"keywords": [
"http",
"url",
"message",
"cookie",
"URI Template"
]
},
{
"name": "guzzle/stream",
"version": "dev-master",
"target-dir": "Guzzle/Stream",
"source": {
"type": "git",
"url": "https://github.com/guzzle/stream",
"reference": "v3.0.5"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/stream/archive/v3.0.5.zip",
"reference": "v3.0.5",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"guzzle/common": "self.version"
},
"time": "2012-11-11 23:54:57",
"type": "library",
"installation-source": "source",
"autoload": {
"psr-0": {
"Guzzle\\Stream": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle stream wrapper component",
"homepage": "http://guzzlephp.org/",
"keywords": [
"stream",
"Guzzle",
"component"
]
},
{
"name": "kriswallsmith/assetic",
"version": "v1.1.0-alpha1",
......@@ -114,6 +290,7 @@
"Assetic": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
......@@ -301,18 +478,18 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation",
"reference": "c209d2d5b6c99121d4f3144a41e449200f4c1477"
"reference": "067c310fe4d0691a24adc97f39500233a58e42cb"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpFoundation/archive/c209d2d5b6c99121d4f3144a41e449200f4c1477.zip",
"reference": "c209d2d5b6c99121d4f3144a41e449200f4c1477",
"url": "https://github.com/symfony/HttpFoundation/archive/067c310fe4d0691a24adc97f39500233a58e42cb.zip",
"reference": "067c310fe4d0691a24adc97f39500233a58e42cb",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-12-03 13:31:00",
"time": "2012-12-06 15:23:16",
"type": "library",
"extra": {
"branch-alias": {
......@@ -352,12 +529,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel",
"reference": "b8d175c14bdf4eb9771690eae9718673dcca8408"
"reference": "dbd6b331aab91deb9e97307eac666b77a0879e07"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpKernel/archive/b8d175c14bdf4eb9771690eae9718673dcca8408.zip",
"reference": "b8d175c14bdf4eb9771690eae9718673dcca8408",
"url": "https://github.com/symfony/HttpKernel/archive/dbd6b331aab91deb9e97307eac666b77a0879e07.zip",
"reference": "dbd6b331aab91deb9e97307eac666b77a0879e07",
"shasum": ""
},
"require": {
......@@ -384,7 +561,7 @@
"symfony/dependency-injection": "2.2.*",
"symfony/finder": "2.2.*"
},
"time": "2012-11-24 12:13:43",
"time": "2012-12-06 13:04:11",
"type": "library",
"extra": {
"branch-alias": {
......@@ -416,30 +593,25 @@
},
{
"name": "symfony/process",
"version": "v2.1.4",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process",
"reference": "v2.1.4"
"reference": "058ae5038a9623fa64b120a2d10ba81f1ade05c7"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Process/archive/v2.1.4.zip",
"reference": "v2.1.4",
"url": "https://github.com/symfony/Process/archive/058ae5038a9623fa64b120a2d10ba81f1ade05c7.zip",
"reference": "058ae5038a9623fa64b120a2d10ba81f1ade05c7",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-11-19 20:53:52",
"time": "2012-12-06 10:00:55",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\Process": ""
......@@ -469,12 +641,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing",
"reference": "de5f6ded706bf50922c89864693c60793d21e935"
"reference": "17109bfef57e52b35d76db4d35b3b66b1d176701"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Routing/archive/de5f6ded706bf50922c89864693c60793d21e935.zip",
"reference": "de5f6ded706bf50922c89864693c60793d21e935",
"url": "https://github.com/symfony/Routing/archive/17109bfef57e52b35d76db4d35b3b66b1d176701.zip",
"reference": "17109bfef57e52b35d76db4d35b3b66b1d176701",
"shasum": ""
},
"require": {
......@@ -491,7 +663,7 @@
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
"time": "2012-12-03 22:11:37",
"time": "2012-12-05 15:37:03",
"type": "library",
"extra": {
"branch-alias": {
......@@ -672,15 +844,10 @@
"aliases": [
],
"minimum-stability": "alpha",
"minimum-stability": "dev",
"stability-flags": {
"symfony/class-loader": 20,
"symfony/dependency-injection": 20,
"symfony/event-dispatcher": 20,
"symfony/http-foundation": 20,
"symfony/http-kernel": 20,
"symfony/routing": 20,
"symfony/serializer": 20,
"symfony/yaml": 20
"twig/twig": 0,
"doctrine/common": 0,
"kriswallsmith/assetic": 15
}
}
core/includes/bootstrap.inc
View file @ a8068088
......@@ -3096,18 +3096,31 @@ function drupal_classloader() {
'Drupal\Component' => DRUPAL_ROOT . '/core/lib',
));
// Register namespaces for vendor libraries managed by Composer.
$namespaces = require DRUPAL_ROOT . '/core/vendor/composer/autoload_namespaces.php';
// Register namespaces and PEAR-like prefixes for vendor libraries managed
// by Composer. Composer combines libraries that use PHP 5.3 namespaces and
// ones that use PEAR-like class prefixes in a single array, but the Symfony
// class loader requires them to be registered separately.
$prefixes_and_namespaces = require DRUPAL_ROOT . '/core/vendor/composer/autoload_namespaces.php';
$prefixes = array();
foreach ($namespaces as $namespace => $path) {
// Composer combines libraries that use PHP 5.3 namespaces and ones that
// use PEAR-style class prefixes in a single array, but the Symfony class
// loader requires them to be registered separately. PSR-0 disallows
// underscores in namespace names and requires at least one in a
// PEAR-style class prefix.
if (strpos($namespace, '_') !== FALSE) {
$prefixes[$namespace] = $path;
unset($namespaces[$namespace]);
$namespaces = array();
foreach ($prefixes_and_namespaces as $key => $path) {
// If the key:
// - Contains a namespace separator, we know it's a namespace.
// - Doesn't contain a namespace separator and ends in an "_" (e.g.,
// "Twig_"), it's likely intended as a PEAR-like prefix rather than a
// namespace.
// - Doesn't contain a namespace separator or end in an "_" (e.g.,
// "Assetic"), then it could be either a namespace or an incomplete
// PEAR-like prefix, but we assume the former, since the only example of
// that currently in Drupal is Assetic.
// @todo Switch to a class loader that doesn't require this guessing:
// http://drupal.org/node/1658720.
$is_namespace = (strpos($key, '\\') !== FALSE) && (substr($key, -1) !== '_');
if ($is_namespace) {
$namespaces[rtrim($key, '\\')] = $path;
}
else {
$prefixes[$key] = $path;
}
}
$loader->registerPrefixes($prefixes);
......
core/vendor/autoload.php
View file @ a8068088
......@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInitac017267abab05dbc458e3a320f5ad98::getLoader();
return ComposerAutoloaderInit295209ab8f7c3b45c210d28fa6db3592::getLoader();
core/vendor/composer/autoload_namespaces.php
View file @ a8068088
......@@ -7,16 +7,15 @@
return array(
'Twig_' => $vendorDir . '/twig/twig/lib/',
'Symfony\\Component\\Yaml' => $vendorDir . '/symfony/yaml/',
'Symfony\\Component\\Serializer' => $vendorDir . '/symfony/serializer/',
'Symfony\\Component\\Routing' => $vendorDir . '/symfony/routing/',
'Symfony\\Component\\Yaml\\' => $vendorDir . '/symfony/yaml/',
'Symfony\\Component\\Serializer\\' => $vendorDir . '/symfony/serializer/',
'Symfony\\Component\\Routing\\' => $vendorDir . '/symfony/routing/',
'Symfony\\Component\\Process' => $vendorDir . '/symfony/process/',
'Symfony\\Component\\HttpKernel' => $vendorDir . '/symfony/http-kernel/',
'Symfony\\Component\\HttpFoundation' => $vendorDir . '/symfony/http-foundation/',
'Symfony\\Component\\EventDispatcher' => $vendorDir . '/symfony/event-dispatcher/',
'Symfony\\Component\\DependencyInjection' => $vendorDir . '/symfony/dependency-injection/',
'Symfony\\Component\\ClassLoader' => $vendorDir . '/symfony/class-loader/',
'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs',
'Symfony\\Component\\HttpKernel\\' => $vendorDir . '/symfony/http-kernel/',
'Symfony\\Component\\HttpFoundation\\' => $vendorDir . '/symfony/http-foundation/',
'Symfony\\Component\\EventDispatcher\\' => $vendorDir . '/symfony/event-dispatcher/',
'Symfony\\Component\\DependencyInjection\\' => $vendorDir . '/symfony/dependency-injection/',
'Symfony\\Component\\ClassLoader\\' => $vendorDir . '/symfony/class-loader/',
'Guzzle\\Stream' => $vendorDir . '/guzzle/stream/',
'Guzzle\\Parser' => $vendorDir . '/guzzle/parser/',
'Guzzle\\Http' => $vendorDir . '/guzzle/http/',
......
core/vendor/composer/autoload_real.php
View file @ a8068088
......@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
class ComposerAutoloaderInitac017267abab05dbc458e3a320f5ad98
class ComposerAutoloaderInit295209ab8f7c3b45c210d28fa6db3592
{
private static $loader;
......@@ -19,9 +19,9 @@ public static function getLoader()
return static::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitac017267abab05dbc458e3a320f5ad98', 'loadClassLoader'));
spl_autoload_register(array('ComposerAutoloaderInit295209ab8f7c3b45c210d28fa6db3592', 'loadClassLoader'));
static::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitac017267abab05dbc458e3a320f5ad98', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit295209ab8f7c3b45c210d28fa6db3592', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
......
core/vendor/composer/installed.json
View file @ a8068088
This diff is collapsed.
core/vendor/guzzle/common/Guzzle/Common/composer.json
View file @ a8068088
......@@ -6,7 +6,7 @@
"license": "MIT",
"require": {
"php": ">=5.3.2",
"symfony/event-dispatcher": "2.1.*"
"symfony/event-dispatcher": ">=2.1"
},
"autoload": {
"psr-0": { "Guzzle\\Common": "" }
......
core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md
View file @ a8068088
......@@ -4,6 +4,7 @@ CHANGELOG
2.2.0
-----
* added a IpUtils class to check if an IP belongs to a CIDR
* added Request::getRealMethod() to get the "real" HTTP method (getMethod() returns the "intended" HTTP method)
* disabled _method request parameter support by default (call Request::enableHttpMethodParameterOverride() to enable it)
* Request::splitHttpAcceptHeader() method is deprecated and will be removed in 2.3
......
core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php 0 → 100644
View file @ a8068088
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\HttpFoundation;
/**
* Http utility functions.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class IpUtils
{
/**
* This class should not be instantiated
*/
private function __construct() {}
/**
* Validates an IPv4 or IPv6 address.
*
* @param string $requestIp
* @param string $ip
*
* @return boolean Whether the IP is valid
*/
public static function checkIp($requestIp, $ip)
{
if (false !== strpos($requestIp, ':')) {
return self::checkIp6($requestIp, $ip);
}
return self::checkIp4($requestIp, $ip);
}
/**
* Validates an IPv4 address.
*
* @param string $requestIp
* @param string $ip
*
* @return boolean Whether the IP is valid
*/
public static function checkIp4($requestIp, $ip)
{
if (false !== strpos($ip, '/')) {
list($address, $netmask) = explode('/', $ip, 2);
if ($netmask < 1 || $netmask > 32) {
return false;
}
} else {
$address = $ip;
$netmask = 32;
}
return 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
}
/**
* Validates an IPv6 address.
*
* @author David Soria Parra <dsp at php dot net>
* @see https://github.com/dsp/v6tools
*
* @param string $requestIp
* @param string $ip
*
* @return boolean Whether the IP is valid
*
* @throws \RuntimeException When IPV6 support is not enabled
*/
public static function checkIp6($requestIp, $ip)
{
if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) {
throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
}
if (false !== strpos($ip, '/')) {
list($address, $netmask) = explode('/', $ip, 2);
if ($netmask < 1 || $netmask > 128) {
return false;
}
} else {
$address = $ip;
$netmask = 128;
}
$bytesAddr = unpack("n*", inet_pton($address));
$bytesTest = unpack("n*", inet_pton($requestIp));
for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; $i++) {
$left = $netmask - 16 * ($i-1);
$left = ($left <= 16) ? $left : 16;
$mask = ~(0xffff >> $left) & 0xffff;
if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
return false;
}
}
return true;
}
}
core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php
View file @ a8068088
......@@ -143,96 +143,11 @@ public function matches(Request $request)
return false;
}
if (null !== $this->ip && !$this->checkIp($request->getClientIp(), $this->ip)) {
if (null !== $this->ip && !IpUtils::checkIp($request->getClientIp(), $this->ip)) {
return false;
}
return true;
}
/**
* Validates an IP address.
*
* @param string $requestIp
* @param string $ip
*
* @return boolean True valid, false if not.
*/
protected function checkIp($requestIp, $ip)
{
// IPv6 address
if (false !== strpos($requestIp, ':')) {
return $this->checkIp6($requestIp, $ip);
} else {
return $this->checkIp4($requestIp, $ip);
}
}
/**
* Validates an IPv4 address.
*
* @param string $requestIp
* @param string $ip
*
* @return boolean True valid, false if not.