Skip to content

GitLab

D
drupal
Commit ef326513 authored by catch's avatar catch
Browse files
Options

Issue #1977570 by RobLoach: Update third-party vendors and fix composer.json

parent e5fbed4c
Hide whitespace changes
Inline Side-by-side
Showing with 5238 additions and 8434 deletions
composer.json
View file @ ef326513
......@@ -4,22 +4,22 @@
"type": "drupal-core",
"license": "GPL-2.0+",
"require": {
"symfony/class-loader": "2.2.0",
"symfony/dependency-injection": "2.2.0",
"symfony/event-dispatcher": "2.2.0",
"symfony/http-foundation": "2.2.0",
"symfony/http-kernel": "2.2.0",
"symfony/routing": "2.2.0",
"symfony/serializer": "2.2.0",
"symfony/validator": "2.2.0",
"symfony/yaml": "2.2.0",
"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": "0.8.0-beta.1",
"phpunit/phpunit": "3.7.15"
"symfony/class-loader": "2.2.*",
"symfony/dependency-injection": "2.2.*",
"symfony/event-dispatcher": "2.2.*",
"symfony/http-foundation": "2.2.*",
"symfony/http-kernel": "2.2.*",
"symfony/routing": "2.2.*",
"symfony/serializer": "2.2.*",
"symfony/validator": "2.2.*",
"symfony/yaml": "2.2.*",
"twig/twig": "1.12.*",
"doctrine/common": "2.3.*",
"guzzle/http": "3.1.*",
"kriswallsmith/assetic": "1.1.*@alpha",
"symfony-cmf/routing": "1.1.*@alpha",
"easyrdf/easyrdf": "0.8.*@beta",
"phpunit/phpunit": "3.7.*"
},
"autoload": {
"psr-0": {
......@@ -28,8 +28,8 @@
"Drupal\\Driver": "drivers/lib/"
}
},
"minimum-stability": "dev",
"config": {
"vendor-dir": "core/vendor"
"vendor-dir": "core/vendor",
"preferred-install": "dist"
}
}
composer.lock
View file @ ef326513
{
"hash": "6b1bf50f976af5d14628f38478885c0f",
"_readme": [
"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": "8969a2b9cb8e5b12a6649cadfa010bab",
"packages": [
{
"name": "doctrine/common",
......@@ -53,7 +57,7 @@
"email": "kontakt@beberlei.de"
},
{
"name": "Johannes Schmitt",
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
......@@ -126,17 +130,17 @@
},
{
"name": "guzzle/common",
"version": "v3.1.0",
"version": "v3.1.2",
"target-dir": "Guzzle/Common",
"source": {
"type": "git",
"url": "git://github.com/guzzle/common.git",
"reference": "v3.1.0"
"reference": "v3.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/common/archive/v3.1.0.zip",
"reference": "v3.1.0",
"url": "https://github.com/guzzle/common/archive/v3.1.2.zip",
"reference": "v3.1.2",
"shasum": ""
},
"require": {
......@@ -166,30 +170,32 @@
"event",
"exception"
],
"time": "2013-01-13 05:14:34"
"time": "2013-01-28 00:07:40"
},
{
"name": "guzzle/http",
"version": "v3.1.0",
"version": "v3.1.2",
"target-dir": "Guzzle/Http",
"source": {
"type": "git",
"url": "git://github.com/guzzle/http.git",
"reference": "v3.1.0"
"reference": "v3.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/http/archive/v3.1.0.zip",
"reference": "v3.1.0",
"url": "https://github.com/guzzle/http/archive/v3.1.2.zip",
"reference": "v3.1.2",
"shasum": ""
},
"require": {
"ext-curl": "*",
"guzzle/common": "self.version",
"guzzle/parser": "self.version",
"guzzle/stream": "self.version",
"php": ">=5.3.2"
},
"suggest": {
"ext-curl": "*"
},
"type": "library",
"extra": {
"branch-alias": {
......@@ -221,21 +227,21 @@
"http",
"http client"
],
"time": "2013-01-13 05:09:32"
"time": "2013-01-26 08:20:43"
},
{
"name": "guzzle/parser",
"version": "v3.1.0",
"version": "v3.1.2",
"target-dir": "Guzzle/Parser",
"source": {
"type": "git",
"url": "git://github.com/guzzle/parser.git",
"reference": "v3.1.0"
"reference": "v3.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/parser/archive/v3.1.0.zip",
"reference": "v3.1.0",
"url": "https://github.com/guzzle/parser/archive/v3.1.2.zip",
"reference": "v3.1.2",
"shasum": ""
},
"require": {
......@@ -269,17 +275,17 @@
},
{
"name": "guzzle/stream",
"version": "v3.1.0",
"version": "v3.1.2",
"target-dir": "Guzzle/Stream",
"source": {
"type": "git",
"url": "https://github.com/guzzle/stream",
"reference": "v3.1.0"
"reference": "v3.0.7"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/stream/archive/v3.1.0.zip",
"reference": "v3.1.0",
"url": "https://github.com/guzzle/stream/archive/v3.0.7.zip",
"reference": "v3.0.7",
"shasum": ""
},
"require": {
......@@ -319,31 +325,38 @@
},
{
"name": "kriswallsmith/assetic",
"version": "v1.1.0-alpha1",
"version": "v1.1.0-alpha4",
"source": {
"type": "git",
"url": "http://github.com/kriswallsmith/assetic.git",
"reference": "v1.1.0-alpha1"
"url": "https://github.com/kriswallsmith/assetic.git",
"reference": "v1.1.0-alpha4"
},
"dist": {
"type": "zip",
"url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1",
"reference": "v1.1.0-alpha1",
"url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.0-alpha4",
"reference": "v1.1.0-alpha4",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
"symfony/process": "2.1.*"
"symfony/process": ">=2.1.0,<2.3-dev"
},
"require-dev": {
"cssmin/cssmin": "*",
"joliclic/javascript-packer": "*",
"kamicane/packager": "*",
"leafo/lessphp": "*",
"leafo/scssphp": "*",
"leafo/scssphp-compass": "*",
"mrclay/minify": "*",
"phpunit/phpunit": "3.7.*",
"ptachoire/cssembed": "*",
"twig/twig": ">=1.6.0,<2.0"
},
"suggest": {
"leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
"leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
"leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin",
"ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
"twig/twig": "Assetic provides the integration with the Twig templating engine"
},
......@@ -356,7 +369,10 @@
"autoload": {
"psr-0": {
"Assetic": "src/"
}
},
"files": [
"src/functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
......@@ -376,11 +392,11 @@
"compression",
"minification"
],
"time": "2012-08-28 05:33:44"
"time": "2013-02-24 17:22:20"
},
{
"name": "phpunit/php-code-coverage",
"version": "1.2.x-dev",
"version": "1.2.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
......@@ -433,16 +449,16 @@
},
{
"name": "phpunit/php-file-iterator",
"version": "dev-master",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26"
"url": "git://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "1.3.3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
"reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
"url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
"reference": "1.3.3",
"shasum": ""
},
"require": {
......@@ -469,25 +485,25 @@
}
],
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
"homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
"homepage": "http://www.phpunit.de/",
"keywords": [
"filesystem",
"iterator"
],
"time": "2013-01-07 10:47:05"
"time": "2012-10-11 04:44:38"
},
{
"name": "phpunit/php-text-template",
"version": "dev-master",
"version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
"reference": "1eeef106193d2f8c539728e566bb4793071a9e18"
"url": "git://github.com/sebastianbergmann/php-text-template.git",
"reference": "1.1.4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18",
"reference": "1eeef106193d2f8c539728e566bb4793071a9e18",
"url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",
"reference": "1.1.4",
"shasum": ""
},
"require": {
......@@ -518,20 +534,20 @@
"keywords": [
"template"
],
"time": "2013-01-07 10:56:17"
"time": "2012-10-31 11:15:28"
},
{
"name": "phpunit/php-timer",
"version": "1.0.x-dev",
"version": "1.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
"url": "git://github.com/sebastianbergmann/php-timer.git",
"reference": "1.0.4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
"reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
"url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",
"reference": "1.0.4",
"shasum": ""
},
"require": {
......@@ -558,24 +574,24 @@
}
],
"description": "Utility class for timing",
"homepage": "https://github.com/sebastianbergmann/php-timer/",
"homepage": "http://www.phpunit.de/",
"keywords": [
"timer"
],
"time": "2013-01-30 06:08:51"
"time": "2012-10-11 04:45:58"
},
{
"name": "phpunit/php-token-stream",
"version": "dev-master",
"version": "1.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98"
"url": "git://github.com/sebastianbergmann/php-token-stream.git",
"reference": "1.1.5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98",
"reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98",
"url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",
"reference": "1.1.5",
"shasum": ""
},
"require": {
......@@ -603,24 +619,24 @@
}
],
"description": "Wrapper around PHP's tokenizer extension.",
"homepage": "https://github.com/sebastianbergmann/php-token-stream/",
"homepage": "http://www.phpunit.de/",
"keywords": [
"tokenizer"
],
"time": "2013-01-07 10:56:35"
"time": "2012-10-11 04:47:14"
},
{
"name": "phpunit/phpunit",
"version": "3.7.15",
"version": "3.7.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3.7.15"
"reference": "3.7.19"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.15",
"reference": "3.7.15",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.19",
"reference": "3.7.19",
"shasum": ""
},
"require": {
......@@ -634,7 +650,7 @@
"phpunit/php-text-template": ">=1.1.1",
"phpunit/php-timer": ">=1.0.2,<1.1.0",
"phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
"symfony/yaml": ">=2.2.0"
"symfony/yaml": ">=2.0.0,<2.3.0"
},
"require-dev": {
"pear-pear/pear": "1.9.4"
......@@ -681,20 +697,20 @@
"testing",
"xunit"