diff --git a/core/composer.json b/core/composer.json
index 4a109a2d5a0e..2e83a4ccfd0a 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -2,28 +2,23 @@
"name": "drupal/drupal",
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"license": "GPL-2.0+",
- "repositories": [{
- "type": "vcs",
- "url": "https://github.com/msonnabaum/phpunit.git"
- }
- ],
"require": {
- "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.2.0-BETA2",
- "symfony/yaml": "2.2.0-BETA2",
+ "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 as dev-3.7"
+ "phpunit/phpunit": "3.7.15"
},
"minimum-stability": "dev"
}
diff --git a/core/composer.lock b/core/composer.lock
index 8715a8ee11f6..4d0f5490b2a4 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -1,5 +1,5 @@
{
- "hash": "a8c56a3549ec70f775e4bf795e65a993",
+ "hash": "6b1bf50f976af5d14628f38478885c0f",
"packages": [
{
"name": "doctrine/common",
@@ -18,7 +18,6 @@
"require": {
"php": ">=5.3.2"
},
- "time": "2012-09-19 22:55:18",
"type": "library",
"extra": {
"branch-alias": {
@@ -68,7 +67,8 @@
"eventmanager",
"persistence",
"spl"
- ]
+ ],
+ "time": "2012-09-19 22:55:18"
},
{
"name": "easyrdf/easyrdf",
@@ -95,7 +95,6 @@
"sami/sami": "dev-master",
"squizlabs/php_codesniffer": ">=1.4.3"
},
- "time": "2013-01-18 15:54:28",
"type": "library",
"autoload": {
"psr-0": {
@@ -122,7 +121,8 @@
"Semantic Web",
"Turtle",
"rdfa"
- ]
+ ],
+ "time": "2013-01-18 15:54:28"
},
{
"name": "guzzle/common",
@@ -143,7 +143,6 @@
"php": ">=5.3.2",
"symfony/event-dispatcher": ">=2.1"
},
- "time": "2013-01-13 05:14:34",
"type": "library",
"extra": {
"branch-alias": {
@@ -166,7 +165,8 @@
"common",
"event",
"exception"
- ]
+ ],
+ "time": "2013-01-13 05:14:34"
},
{
"name": "guzzle/http",
@@ -190,7 +190,6 @@
"guzzle/stream": "self.version",
"php": ">=5.3.2"
},
- "time": "2013-01-13 05:09:32",
"type": "library",
"extra": {
"branch-alias": {
@@ -221,7 +220,8 @@
"curl",
"http",
"http client"
- ]
+ ],
+ "time": "2013-01-13 05:09:32"
},
{
"name": "guzzle/parser",
@@ -241,7 +241,6 @@
"require": {
"php": ">=5.3.2"
},
- "time": "2013-01-12 21:43:21",
"type": "library",
"extra": {
"branch-alias": {
@@ -265,7 +264,8 @@
"http",
"message",
"url"
- ]
+ ],
+ "time": "2013-01-12 21:43:21"
},
{
"name": "guzzle/stream",
@@ -286,7 +286,6 @@
"guzzle/common": "self.version",
"php": ">=5.3.2"
},
- "time": "2012-12-07 16:45:11",
"type": "library",
"extra": {
"branch-alias": {
@@ -315,7 +314,8 @@
"Guzzle",
"component",
"stream"
- ]
+ ],
+ "time": "2012-12-07 16:45:11"
},
{
"name": "kriswallsmith/assetic",
@@ -347,7 +347,6 @@
"ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
"twig/twig": "Assetic provides the integration with the Twig templating engine"
},
- "time": "2012-08-28 05:33:44",
"type": "library",
"extra": {
"branch-alias": {
@@ -376,20 +375,21 @@
"assets",
"compression",
"minification"
- ]
+ ],
+ "time": "2012-08-28 05:33:44"
},
{
"name": "phpunit/php-code-coverage",
"version": "1.2.x-dev",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280"
+ "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+ "reference": "1.2.9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fa8ba7588bdaa48b93cd60629273ee6b9699b280",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9",
+ "reference": "1.2.9",
"shasum": ""
},
"require": {
@@ -402,7 +402,6 @@
"ext-dom": "*",
"ext-xdebug": ">=2.0.5"
},
- "time": "2013-02-12 10:55:13",
"type": "library",
"autoload": {
"classmap": [
@@ -429,14 +428,15 @@
"coverage",
"testing",
"xunit"
- ]
+ ],
+ "time": "2013-02-26 18:55:56"
},
{
"name": "phpunit/php-file-iterator",
"version": "dev-master",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
+ "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26"
},
"dist": {
@@ -448,7 +448,6 @@
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-07 10:47:05",
"type": "library",
"autoload": {
"classmap": [
@@ -474,14 +473,15 @@
"keywords": [
"filesystem",
"iterator"
- ]
+ ],
+ "time": "2013-01-07 10:47:05"
},
{
"name": "phpunit/php-text-template",
"version": "dev-master",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-text-template.git",
+ "url": "https://github.com/sebastianbergmann/php-text-template.git",
"reference": "1eeef106193d2f8c539728e566bb4793071a9e18"
},
"dist": {
@@ -493,7 +493,6 @@
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-07 10:56:17",
"type": "library",
"autoload": {
"classmap": [
@@ -518,14 +517,15 @@
"homepage": "https://github.com/sebastianbergmann/php-text-template/",
"keywords": [
"template"
- ]
+ ],
+ "time": "2013-01-07 10:56:17"
},
{
"name": "phpunit/php-timer",
"version": "1.0.x-dev",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-timer.git",
+ "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
},
"dist": {
@@ -537,7 +537,6 @@
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-30 06:08:51",
"type": "library",
"autoload": {
"classmap": [
@@ -562,14 +561,15 @@
"homepage": "https://github.com/sebastianbergmann/php-timer/",
"keywords": [
"timer"
- ]
+ ],
+ "time": "2013-01-30 06:08:51"
},
{
"name": "phpunit/php-token-stream",
"version": "dev-master",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-token-stream.git",
+ "url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98"
},
"dist": {
@@ -582,7 +582,6 @@
"ext-tokenizer": "*",
"php": ">=5.3.3"
},
- "time": "2013-01-07 10:56:35",
"type": "library",
"autoload": {
"classmap": [
@@ -607,20 +606,21 @@
"homepage": "https://github.com/sebastianbergmann/php-token-stream/",
"keywords": [
"tokenizer"
- ]
+ ],
+ "time": "2013-01-07 10:56:35"
},
{
"name": "phpunit/phpunit",
- "version": "3.7.0",
+ "version": "3.7.15",
"source": {
"type": "git",
- "url": "https://github.com/msonnabaum/phpunit.git",
- "reference": "3.7.0"
+ "url": "https://github.com/sebastianbergmann/phpunit.git",
+ "reference": "3.7.15"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/msonnabaum/phpunit/zipball/3.7.0",
- "reference": "3.7.0",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.15",
+ "reference": "3.7.15",
"shasum": ""
},
"require": {
@@ -629,20 +629,22 @@
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.3.3",
- "phpunit/php-code-coverage": ">=1.2.0@stable",
- "phpunit/php-file-iterator": ">=1.3.1@stable",
- "phpunit/php-text-template": ">=1.1.1@stable",
- "phpunit/php-timer": ">=1.0.2@stable",
- "phpunit/phpunit-mock-objects": ">=1.2.0@stable",
- "symfony/yaml": ">=2.1.0@stable"
+ "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
+ "phpunit/php-file-iterator": ">=1.3.1",
+ "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"
+ },
+ "require-dev": {
+ "pear-pear/pear": "1.9.4"
},
"suggest": {
"ext-json": "*",
"ext-simplexml": "*",
"ext-tokenizer": "*",
- "phpunit/php-invoker": ">=1.1.0@stable"
+ "phpunit/php-invoker": ">=1.1.0,<1.2.0"
},
- "time": "2012-09-19 05:07:48",
"bin": [
"composer/bin/phpunit"
],
@@ -653,10 +655,11 @@
}
},
"autoload": {
- "files": [
- "PHPUnit/Autoload.php"
+ "classmap": [
+ "PHPUnit/"
]
},
+ "notification-url": "https://packagist.org/downloads/",
"include-path": [
"",
"../../symfony/yaml/"
@@ -678,18 +681,14 @@
"testing",
"xunit"
],
- "support": {
- "issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "irc": "irc://irc.freenode.net/phpunit",
- "source": "https://github.com/msonnabaum/phpunit/tree/3.7.0"
- }
+ "time": "2013-03-01 11:55:06"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "1.2.x-dev",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
+ "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4"
},
"dist": {
@@ -705,7 +704,6 @@
"suggest": {
"ext-soap": "*"
},
- "time": "2013-02-05 07:46:41",
"type": "library",
"autoload": {
"classmap": [
@@ -731,7 +729,8 @@
"keywords": [
"mock",
"xunit"
- ]
+ ],
+ "time": "2013-02-05 07:46:41"
},
{
"name": "psr/log",
@@ -747,7 +746,6 @@
"reference": "1.0.0",
"shasum": ""
},
- "time": "2012-12-21 11:40:51",
"type": "library",
"autoload": {
"psr-0": {
@@ -769,7 +767,8 @@
"log",
"psr",
"psr-3"
- ]
+ ],
+ "time": "2012-12-21 11:40:51"
},
{
"name": "symfony-cmf/routing",
@@ -777,12 +776,12 @@
"target-dir": "Symfony/Cmf/Component/Routing",
"source": {
"type": "git",
- "url": "https://github.com/symfony-cmf/Routing",
+ "url": "https://github.com/symfony-cmf/Routing.git",
"reference": "ea4a10"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/72df1da07b3c4edf16df169fb7987f504070fe0d",
+ "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/43585d83fb07f9354c098fcae593010567f53d45",
"reference": "ea4a10",
"shasum": ""
},
@@ -791,7 +790,6 @@
"symfony/http-kernel": ">=2.1,<2.3-dev",
"symfony/routing": ">=2.1,<2.3-dev"
},
- "time": "2013-01-21 20:33:16",
"type": "library",
"extra": {
"branch-alias": {
@@ -818,30 +816,30 @@
"keywords": [
"database",
"routing"
- ]
+ ],
+ "time": "2013-01-21 20:33:16"
},
{
"name": "symfony/class-loader",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/ClassLoader",
"source": {
"type": "git",
- "url": "https://github.com/symfony/ClassLoader",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/ClassLoader.git",
+ "reference": "v2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/ClassLoader/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0",
+ "reference": "v2.2.0",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/finder": "2.2.*"
+ "symfony/finder": ">=2.0,<3.0"
},
- "time": "2013-01-23 20:21:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -868,35 +866,35 @@
}
],
"description": "Symfony ClassLoader Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-03-01 06:43:14"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
- "url": "https://github.com/symfony/DependencyInjection",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/DependencyInjection.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/DependencyInjection/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/config": "2.2.*",
- "symfony/yaml": "2.2.*"
+ "symfony/config": ">=2.2,<2.3-dev",
+ "symfony/yaml": ">=2.0,<3.0"
},
"suggest": {
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "time": "2013-01-23 20:21:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -923,34 +921,34 @@
}
],
"description": "Symfony DependencyInjection Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-11 11:43:49"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
- "url": "https://github.com/symfony/EventDispatcher",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/EventDispatcher.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/EventDispatcher/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/dependency-injection": "2.2.*"
+ "symfony/dependency-injection": ">=2.0,<3.0"
},
"suggest": {
"symfony/dependency-injection": "2.2.*",
"symfony/http-kernel": "2.2.*"
},
- "time": "2013-01-17 15:25:59",
"type": "library",
"extra": {
"branch-alias": {
@@ -977,27 +975,27 @@
}
],
"description": "Symfony EventDispatcher Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-11 11:26:43"
},
{
"name": "symfony/http-foundation",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpFoundation",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/HttpFoundation.git",
+ "reference": "v2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpFoundation/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0",
+ "reference": "v2.2.0",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-21 16:56:55",
"type": "library",
"extra": {
"branch-alias": {
@@ -1027,39 +1025,40 @@
}
],
"description": "Symfony HttpFoundation Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-26 09:42:13"
},
{
"name": "symfony/http-kernel",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpKernel",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/HttpKernel.git",
+ "reference": "v2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpKernel/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0",
+ "reference": "v2.2.0",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"psr/log": ">=1.0,<2.0",
- "symfony/event-dispatcher": "2.2.*",
- "symfony/http-foundation": "2.2.*"
+ "symfony/event-dispatcher": ">=2.1,<3.0",
+ "symfony/http-foundation": ">=2.2,<2.3-dev"
},
"require-dev": {
"symfony/browser-kit": "2.2.*",
- "symfony/class-loader": "2.2.*",
- "symfony/config": "2.2.*",
+ "symfony/class-loader": ">=2.1,<3.0",
+ "symfony/config": ">=2.0,<3.0",
"symfony/console": "2.2.*",
- "symfony/dependency-injection": "2.2.*",
- "symfony/finder": "2.2.*",
- "symfony/process": "2.2.*",
- "symfony/routing": "2.2.*",
- "symfony/stopwatch": "2.2.*"
+ "symfony/dependency-injection": ">=2.0,<3.0",
+ "symfony/finder": ">=2.0,<3.0",
+ "symfony/process": ">=2.0,<3.0",
+ "symfony/routing": ">=2.2,<2.3-dev",
+ "symfony/stopwatch": ">=2.2,<2.3-dev"
},
"suggest": {
"symfony/browser-kit": "2.2.*",
@@ -1069,7 +1068,6 @@
"symfony/dependency-injection": "2.2.*",
"symfony/finder": "2.2.*"
},
- "time": "2013-01-24 07:15:19",
"type": "library",
"extra": {
"branch-alias": {
@@ -1096,7 +1094,8 @@
}
],
"description": "Symfony HttpKernel Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-03-01 06:52:29"
},
{
"name": "symfony/process",
@@ -1104,19 +1103,18 @@
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process",
- "reference": "v2.1.7"
+ "url": "https://github.com/symfony/Process.git",
+ "reference": "v2.1.8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.7",
- "reference": "v2.1.7",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.8",
+ "reference": "v2.1.8",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-16 09:27:54",
"type": "library",
"autoload": {
"psr-0": {
@@ -1138,39 +1136,38 @@
}
],
"description": "Symfony Process Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-18 21:27:57"
},
{
"name": "symfony/routing",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Routing",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Routing.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Routing/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "doctrine/common": ">=2.2,<2.4-dev",
+ "doctrine/common": ">=2.2,<3.0",
"psr/log": ">=1.0,<2.0",
- "symfony/config": "2.2.*",
- "symfony/http-kernel": "2.2.*",
- "symfony/yaml": "2.2.*"
+ "symfony/config": ">=2.2,<2.3-dev",
+ "symfony/yaml": ">=2.0,<3.0"
},
"suggest": {
- "doctrine/common": ">=2.2,<2.4-dev",
+ "doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "time": "2013-01-21 16:57:32",
"type": "library",
"extra": {
"branch-alias": {
@@ -1197,27 +1194,27 @@
}
],
"description": "Symfony Routing Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-11 11:24:47"
},
{
"name": "symfony/serializer",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/Serializer",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Serializer",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Serializer.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Serializer/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-19 07:50:02",
"type": "library",
"extra": {
"branch-alias": {
@@ -1244,39 +1241,39 @@
}
],
"description": "Symfony Serializer Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-01-19 07:50:02"
},
{
"name": "symfony/translation",
- "version": "2.2.x-dev",
+ "version": "dev-master",
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Translation",
- "reference": "v2.2.0-RC2"
+ "url": "https://github.com/symfony/Translation.git",
+ "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.0-RC2",
- "reference": "v2.2.0-RC2",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/10164d84c407fd9ac5918172f86a4b94bf2b9c0b",
+ "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/config": ">=2.0,<2.3-dev",
+ "symfony/config": ">=2.0,<2.4-dev",
"symfony/yaml": ">=2.2,<3.0"
},
"suggest": {
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "time": "2013-02-08 16:10:57",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -1299,40 +1296,41 @@
}
],
"description": "Symfony Translation Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-11 10:13:11"
},
{
"name": "symfony/validator",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/Validator",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Validator",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Validator.git",
+ "reference": "v2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Validator/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.0",
+ "reference": "v2.2.0",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "symfony/translation": "2.2.*"
+ "symfony/translation": ">=2.0,<3.0"
},
"require-dev": {
+ "symfony/config": ">=2.2,<2.3-dev",
+ "symfony/http-foundation": ">=2.1,<3.0",
+ "symfony/locale": ">=2.0,<3.0",
+ "symfony/yaml": ">=2.0,<3.0"
+ },
+ "suggest": {
+ "doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/http-foundation": "2.2.*",
"symfony/locale": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "suggest": {
- "doctrine/common": ">=2.1,<2.4-dev",
- "symfony/config": "2.2.*",
- "symfony/http-foundation": "2.2.*",
- "symfony/yaml": "2.2.*"
- },
- "time": "2013-01-21 16:57:12",
"type": "library",
"extra": {
"branch-alias": {
@@ -1359,27 +1357,27 @@
}
],
"description": "Symfony Validator Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-02-28 14:29:34"
},
{
"name": "symfony/yaml",
- "version": "v2.2.0-BETA2",
+ "version": "v2.2.0",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Yaml/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-23 20:21:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1406,7 +1404,8 @@
}
],
"description": "Symfony Yaml Component",
- "homepage": "http://symfony.com"
+ "homepage": "http://symfony.com",
+ "time": "2013-01-27 16:49:19"
},
{
"name": "twig/twig",
@@ -1425,7 +1424,6 @@
"require": {
"php": ">=5.2.4"
},
- "time": "2013-01-15 20:03:52",
"type": "library",
"extra": {
"branch-alias": {
@@ -1455,29 +1453,18 @@
"homepage": "http://twig.sensiolabs.org",
"keywords": [
"templating"
- ]
+ ],
+ "time": "2013-01-15 20:03:52"
}
],
- "packages-dev": null,
+ "packages-dev": [
+
+ ],
"aliases": [
- {
- "alias": "dev-3.7",
- "alias_normalized": "dev-3.7",
- "version": "3.7.0.0",
- "package": "phpunit/phpunit"
- }
+
],
"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,
- "symfony/validator": 10,
- "symfony/yaml": 10,
"kriswallsmith/assetic": 15,
"symfony-cmf/routing": 20,
"easyrdf/easyrdf": 10
diff --git a/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php b/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
index 8a164f31e41d..0b16ae87fa93 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
@@ -38,6 +38,19 @@ class PropertyContainerMetadata extends Metadata implements PropertyMetadataCont
}
}
+ /**
+ * Implements PropertyMetadataContainerInterface::hasPropertyMetadata().
+ */
+ public function hasPropertyMetadata($property_name) {
+ try {
+ $exists = (bool)$this->getPropertyMetadata($property_name);
+ }
+ catch (\LogicException $e) {
+ $exists = FALSE;
+ }
+ return $exists;
+ }
+
/**
* Implements PropertyMetadataContainerInterface::getPropertyMetadata().
*/
diff --git a/core/vendor/README.txt b/core/vendor/README.txt
deleted file mode 100644
index 33a40f5a4905..000000000000
--- a/core/vendor/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-3rd party libraries provided by Drupal core should be placed in this directory.
-They should not be modified from their original form at any time. They should
-be changed only to keep up to date with upstream projects.
-
-Code in this directory MAY be licensed under a GPL-compatible non-GPL license.
-If so, it must be properly documented in COPYRIGHT.txt.
diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php
index 5a49ae75b5f7..f77afa164938 100644
--- a/core/vendor/autoload.php
+++ b/core/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f::getLoader();
+return ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1::getLoader();
diff --git a/core/vendor/composer/autoload_classmap.php b/core/vendor/composer/autoload_classmap.php
index 413ca7855589..060e183e4d1f 100644
--- a/core/vendor/composer/autoload_classmap.php
+++ b/core/vendor/composer/autoload_classmap.php
@@ -9,6 +9,75 @@ return array(
'File_Iterator' => $baseDir . '/vendor/phpunit/php-file-iterator/File/Iterator.php',
'File_Iterator_Facade' => $baseDir . '/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php',
'File_Iterator_Factory' => $baseDir . '/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php',
+ 'PHPUnit_Extensions_GroupTestSuite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php',
+ 'PHPUnit_Extensions_PhptTestCase' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php',
+ 'PHPUnit_Extensions_PhptTestCase_Logger' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php',
+ 'PHPUnit_Extensions_PhptTestSuite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php',
+ 'PHPUnit_Extensions_RepeatedTest' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php',
+ 'PHPUnit_Extensions_TestDecorator' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php',
+ 'PHPUnit_Extensions_TicketListener' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php',
+ 'PHPUnit_Framework_Assert' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Assert.php',
+ 'PHPUnit_Framework_AssertionFailedError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php',
+ 'PHPUnit_Framework_Comparator' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator.php',
+ 'PHPUnit_Framework_ComparatorFactory' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php',
+ 'PHPUnit_Framework_Comparator_Array' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php',
+ 'PHPUnit_Framework_Comparator_DOMDocument' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php',
+ 'PHPUnit_Framework_Comparator_Double' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php',
+ 'PHPUnit_Framework_Comparator_Exception' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php',
+ 'PHPUnit_Framework_Comparator_MockObject' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php',
+ 'PHPUnit_Framework_Comparator_Numeric' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php',
+ 'PHPUnit_Framework_Comparator_Object' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php',
+ 'PHPUnit_Framework_Comparator_Resource' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php',
+ 'PHPUnit_Framework_Comparator_Scalar' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php',
+ 'PHPUnit_Framework_Comparator_SplObjectStorage' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php',
+ 'PHPUnit_Framework_Comparator_Type' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php',
+ 'PHPUnit_Framework_ComparisonFailure' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php',
+ 'PHPUnit_Framework_Constraint' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint.php',
+ 'PHPUnit_Framework_Constraint_And' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php',
+ 'PHPUnit_Framework_Constraint_ArrayHasKey' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php',
+ 'PHPUnit_Framework_Constraint_Attribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php',
+ 'PHPUnit_Framework_Constraint_Callback' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php',
+ 'PHPUnit_Framework_Constraint_ClassHasAttribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php',
+ 'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php',
+ 'PHPUnit_Framework_Constraint_Composite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php',
+ 'PHPUnit_Framework_Constraint_Count' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php',
+ 'PHPUnit_Framework_Constraint_Exception' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php',
+ 'PHPUnit_Framework_Constraint_ExceptionCode' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php',
+ 'PHPUnit_Framework_Constraint_ExceptionMessage' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php',
+ 'PHPUnit_Framework_Constraint_FileExists' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php',
+ 'PHPUnit_Framework_Constraint_GreaterThan' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php',
+ 'PHPUnit_Framework_Constraint_IsAnything' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php',
+ 'PHPUnit_Framework_Constraint_IsEmpty' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php',
+ 'PHPUnit_Framework_Constraint_IsEqual' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php',
+ 'PHPUnit_Framework_Constraint_IsFalse' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php',
+ 'PHPUnit_Framework_Constraint_IsIdentical' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php',
+ 'PHPUnit_Framework_Constraint_IsInstanceOf' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php',
+ 'PHPUnit_Framework_Constraint_IsNull' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php',
+ 'PHPUnit_Framework_Constraint_IsTrue' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php',
+ 'PHPUnit_Framework_Constraint_IsType' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php',
+ 'PHPUnit_Framework_Constraint_JsonMatches' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php',
+ 'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
+ 'PHPUnit_Framework_Constraint_LessThan' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php',
+ 'PHPUnit_Framework_Constraint_Not' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php',
+ 'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php',
+ 'PHPUnit_Framework_Constraint_Or' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php',
+ 'PHPUnit_Framework_Constraint_PCREMatch' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php',
+ 'PHPUnit_Framework_Constraint_SameSize' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php',
+ 'PHPUnit_Framework_Constraint_StringContains' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php',
+ 'PHPUnit_Framework_Constraint_StringEndsWith' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php',
+ 'PHPUnit_Framework_Constraint_StringMatches' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php',
+ 'PHPUnit_Framework_Constraint_StringStartsWith' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php',
+ 'PHPUnit_Framework_Constraint_TraversableContains' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php',
+ 'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php',
+ 'PHPUnit_Framework_Constraint_Xor' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php',
+ 'PHPUnit_Framework_Error' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error.php',
+ 'PHPUnit_Framework_Error_Deprecated' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php',
+ 'PHPUnit_Framework_Error_Notice' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php',
+ 'PHPUnit_Framework_Error_Warning' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php',
+ 'PHPUnit_Framework_Exception' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Exception.php',
+ 'PHPUnit_Framework_ExpectationFailedException' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php',
+ 'PHPUnit_Framework_IncompleteTest' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php',
+ 'PHPUnit_Framework_IncompleteTestError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php',
'PHPUnit_Framework_MockObject_Builder_Identity' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php',
'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php',
'PHPUnit_Framework_MockObject_Builder_Match' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php',
@@ -45,6 +114,55 @@ return array(
'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php',
'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php',
'PHPUnit_Framework_MockObject_Verifiable' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php',
+ 'PHPUnit_Framework_OutputError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/OutputError.php',
+ 'PHPUnit_Framework_SelfDescribing' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php',
+ 'PHPUnit_Framework_SkippedTest' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php',
+ 'PHPUnit_Framework_SkippedTestError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php',
+ 'PHPUnit_Framework_SkippedTestSuiteError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php',
+ 'PHPUnit_Framework_SyntheticError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php',
+ 'PHPUnit_Framework_Test' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Test.php',
+ 'PHPUnit_Framework_TestCase' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php',
+ 'PHPUnit_Framework_TestFailure' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestFailure.php',
+ 'PHPUnit_Framework_TestListener' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestListener.php',
+ 'PHPUnit_Framework_TestResult' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestResult.php',
+ 'PHPUnit_Framework_TestSuite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php',
+ 'PHPUnit_Framework_TestSuite_DataProvider' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php',
+ 'PHPUnit_Framework_Warning' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Warning.php',
+ 'PHPUnit_Runner_BaseTestRunner' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php',
+ 'PHPUnit_Runner_StandardTestSuiteLoader' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php',
+ 'PHPUnit_Runner_TestSuiteLoader' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php',
+ 'PHPUnit_Runner_Version' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php',
+ 'PHPUnit_TextUI_Command' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php',
+ 'PHPUnit_TextUI_ResultPrinter' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php',
+ 'PHPUnit_TextUI_TestRunner' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php',
+ 'PHPUnit_Util_Class' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Class.php',
+ 'PHPUnit_Util_Configuration' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Configuration.php',
+ 'PHPUnit_Util_DeprecatedFeature' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php',
+ 'PHPUnit_Util_DeprecatedFeature_Logger' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php',
+ 'PHPUnit_Util_Diff' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Diff.php',
+ 'PHPUnit_Util_ErrorHandler' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php',
+ 'PHPUnit_Util_Fileloader' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Fileloader.php',
+ 'PHPUnit_Util_Filesystem' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Filesystem.php',
+ 'PHPUnit_Util_Filter' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Filter.php',
+ 'PHPUnit_Util_Getopt' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Getopt.php',
+ 'PHPUnit_Util_GlobalState' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/GlobalState.php',
+ 'PHPUnit_Util_InvalidArgumentHelper' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php',
+ 'PHPUnit_Util_Log_JSON' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Log/JSON.php',
+ 'PHPUnit_Util_Log_JUnit' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php',
+ 'PHPUnit_Util_Log_TAP' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Log/TAP.php',
+ 'PHPUnit_Util_PHP' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/PHP.php',
+ 'PHPUnit_Util_PHP_Default' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Default.php',
+ 'PHPUnit_Util_PHP_Windows' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php',
+ 'PHPUnit_Util_Printer' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Printer.php',
+ 'PHPUnit_Util_String' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/String.php',
+ 'PHPUnit_Util_Test' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Test.php',
+ 'PHPUnit_Util_TestDox_NamePrettifier' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php',
+ 'PHPUnit_Util_TestDox_ResultPrinter' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php',
+ 'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php',
+ 'PHPUnit_Util_TestDox_ResultPrinter_Text' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php',
+ 'PHPUnit_Util_TestSuiteIterator' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php',
+ 'PHPUnit_Util_Type' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Type.php',
+ 'PHPUnit_Util_XML' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/XML.php',
'PHP_CodeCoverage' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage.php',
'PHP_CodeCoverage_Driver' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php',
'PHP_CodeCoverage_Driver_Xdebug' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php',
diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php
index 24c4d513248c..56de95f2dddd 100644
--- 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 ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f
+class ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f', 'loadClassLoader'));
+ spl_autoload_register(array('ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1', 'loadClassLoader'));
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -42,8 +42,6 @@ class ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f
$loader->register(true);
- require $vendorDir . '/phpunit/phpunit/PHPUnit/Autoload.php';
-
return $loader;
}
}
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index d272cdb29211..c66ffb31b097 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -128,19 +128,19 @@
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process",
- "reference": "v2.1.7"
+ "url": "https://github.com/symfony/Process.git",
+ "reference": "v2.1.8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.7",
- "reference": "v2.1.7",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.8",
+ "reference": "v2.1.8",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-16 09:27:54",
+ "time": "2013-02-18 21:27:57",
"type": "library",
"installation-source": "source",
"autoload": {
@@ -270,24 +270,24 @@
},
{
"name": "symfony/http-foundation",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpFoundation",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/HttpFoundation.git",
+ "reference": "v2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpFoundation/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0",
+ "reference": "v2.2.0",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-21 16:56:55",
+ "time": "2013-02-26 09:42:13",
"type": "library",
"extra": {
"branch-alias": {
@@ -322,31 +322,31 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
- "url": "https://github.com/symfony/EventDispatcher",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/EventDispatcher.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/EventDispatcher/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/dependency-injection": "2.2.*"
+ "symfony/dependency-injection": ">=2.0,<3.0"
},
"suggest": {
"symfony/dependency-injection": "2.2.*",
"symfony/http-kernel": "2.2.*"
},
- "time": "2013-01-17 15:25:59",
+ "time": "2013-02-11 11:26:43",
"type": "library",
"extra": {
"branch-alias": {
@@ -378,36 +378,36 @@
},
{
"name": "symfony/http-kernel",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpKernel",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/HttpKernel.git",
+ "reference": "v2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpKernel/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0",
+ "reference": "v2.2.0",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"psr/log": ">=1.0,<2.0",
- "symfony/event-dispatcher": "2.2.*",
- "symfony/http-foundation": "2.2.*"
+ "symfony/event-dispatcher": ">=2.1,<3.0",
+ "symfony/http-foundation": ">=2.2,<2.3-dev"
},
"require-dev": {
"symfony/browser-kit": "2.2.*",
- "symfony/class-loader": "2.2.*",
- "symfony/config": "2.2.*",
+ "symfony/class-loader": ">=2.1,<3.0",
+ "symfony/config": ">=2.0,<3.0",
"symfony/console": "2.2.*",
- "symfony/dependency-injection": "2.2.*",
- "symfony/finder": "2.2.*",
- "symfony/process": "2.2.*",
- "symfony/routing": "2.2.*",
- "symfony/stopwatch": "2.2.*"
+ "symfony/dependency-injection": ">=2.0,<3.0",
+ "symfony/finder": ">=2.0,<3.0",
+ "symfony/process": ">=2.0,<3.0",
+ "symfony/routing": ">=2.2,<2.3-dev",
+ "symfony/stopwatch": ">=2.2,<2.3-dev"
},
"suggest": {
"symfony/browser-kit": "2.2.*",
@@ -417,7 +417,7 @@
"symfony/dependency-injection": "2.2.*",
"symfony/finder": "2.2.*"
},
- "time": "2013-01-24 07:15:19",
+ "time": "2013-03-01 06:52:29",
"type": "library",
"extra": {
"branch-alias": {
@@ -449,36 +449,35 @@
},
{
"name": "symfony/routing",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Routing",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Routing.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Routing/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "doctrine/common": ">=2.2,<2.4-dev",
+ "doctrine/common": ">=2.2,<3.0",
"psr/log": ">=1.0,<2.0",
- "symfony/config": "2.2.*",
- "symfony/http-kernel": "2.2.*",
- "symfony/yaml": "2.2.*"
+ "symfony/config": ">=2.2,<2.3-dev",
+ "symfony/yaml": ">=2.0,<3.0"
},
"suggest": {
- "doctrine/common": ">=2.2,<2.4-dev",
+ "doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "time": "2013-01-21 16:57:32",
+ "time": "2013-02-11 11:24:47",
"type": "library",
"extra": {
"branch-alias": {
@@ -508,6 +507,57 @@
"description": "Symfony Routing Component",
"homepage": "http://symfony.com"
},
+ {
+ "name": "symfony-cmf/routing",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "target-dir": "Symfony/Cmf/Component/Routing",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony-cmf/Routing.git",
+ "reference": "ea4a10"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/43585d83fb07f9354c098fcae593010567f53d45",
+ "reference": "ea4a10",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2",
+ "symfony/http-kernel": ">=2.1,<2.3-dev",
+ "symfony/routing": ">=2.1,<2.3-dev"
+ },
+ "time": "2013-02-22 13:50:34",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Cmf\\Component\\Routing": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony CMF Community",
+ "homepage": "https://github.com/symfony-cmf/Routing/contributors"
+ }
+ ],
+ "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
+ "homepage": "http://cmf.symfony.com",
+ "keywords": [
+ "database",
+ "routing"
+ ]
+ },
{
"name": "easyrdf/easyrdf",
"version": "0.8.0-beta.1",
@@ -564,78 +614,26 @@
"rdfa"
]
},
- {
- "name": "symfony/class-loader",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
- "target-dir": "Symfony/Component/ClassLoader",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/ClassLoader",
- "reference": "v2.2.0-BETA2"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/symfony/ClassLoader/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/finder": "2.2.*"
- },
- "time": "2013-01-23 20:21:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\ClassLoader\\": ""
- }
- },
- "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 ClassLoader Component",
- "homepage": "http://symfony.com"
- },
{
"name": "symfony/yaml",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Yaml/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-23 20:21:00",
+ "time": "2013-01-27 16:49:19",
"type": "library",
"extra": {
"branch-alias": {
@@ -666,38 +664,516 @@
"homepage": "http://symfony.com"
},
{
- "name": "symfony/validator",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
- "target-dir": "Symfony/Component/Validator",
+ "name": "phpunit/php-text-template",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Validator",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/sebastianbergmann/php-text-template.git",
+ "reference": "1eeef106193d2f8c539728e566bb4793071a9e18"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Validator/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18",
+ "reference": "1eeef106193d2f8c539728e566bb4793071a9e18",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2013-01-07 10:56:17",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "Text/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Simple template engine.",
+ "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+ "keywords": [
+ "template"
+ ]
+ },
+ {
+ "name": "phpunit/phpunit-mock-objects",
+ "version": "1.2.x-dev",
+ "version_normalized": "1.2.9999999.9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+ "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4",
+ "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "symfony/translation": "2.2.*"
+ "phpunit/php-text-template": ">=1.1.1@stable"
+ },
+ "suggest": {
+ "ext-soap": "*"
+ },
+ "time": "2013-02-05 07:46:41",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "PHPUnit/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Mock Object library for PHPUnit",
+ "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+ "keywords": [
+ "mock",
+ "xunit"
+ ]
+ },
+ {
+ "name": "phpunit/php-timer",
+ "version": "1.0.x-dev",
+ "version_normalized": "1.0.9999999.9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/php-timer.git",
+ "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
+ "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2013-01-30 06:08:51",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "PHP/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Utility class for timing",
+ "homepage": "https://github.com/sebastianbergmann/php-timer/",
+ "keywords": [
+ "timer"
+ ]
+ },
+ {
+ "name": "phpunit/php-token-stream",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+ "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98",
+ "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98",
+ "shasum": ""
+ },
+ "require": {
+ "ext-tokenizer": "*",
+ "php": ">=5.3.3"
+ },
+ "time": "2013-01-07 10:56:35",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "PHP/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Wrapper around PHP's tokenizer extension.",
+ "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+ "keywords": [
+ "tokenizer"
+ ]
+ },
+ {
+ "name": "phpunit/php-file-iterator",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+ "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
+ "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2013-01-07 10:47:05",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "File/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+ "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+ "keywords": [
+ "filesystem",
+ "iterator"
+ ]
+ },
+ {
+ "name": "phpunit/php-code-coverage",
+ "version": "1.2.x-dev",
+ "version_normalized": "1.2.9999999.9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+ "reference": "1.2.9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9",
+ "reference": "1.2.9",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "phpunit/php-file-iterator": ">=1.3.0@stable",
+ "phpunit/php-text-template": ">=1.1.1@stable",
+ "phpunit/php-token-stream": ">=1.1.3@stable"
+ },
+ "suggest": {
+ "ext-dom": "*",
+ "ext-xdebug": ">=2.0.5"
+ },
+ "time": "2013-02-26 18:55:56",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "PHP/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+ "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+ "keywords": [
+ "coverage",
+ "testing",
+ "xunit"
+ ]
+ },
+ {
+ "name": "phpunit/phpunit",
+ "version": "3.7.15",
+ "version_normalized": "3.7.15.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/phpunit.git",
+ "reference": "3.7.15"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.15",
+ "reference": "3.7.15",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-pcre": "*",
+ "ext-reflection": "*",
+ "ext-spl": "*",
+ "php": ">=5.3.3",
+ "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
+ "phpunit/php-file-iterator": ">=1.3.1",
+ "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"
},
"require-dev": {
+ "pear-pear/pear": "1.9.4"
+ },
+ "suggest": {
+ "ext-json": "*",
+ "ext-simplexml": "*",
+ "ext-tokenizer": "*",
+ "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+ },
+ "time": "2013-03-01 11:55:06",
+ "bin": [
+ "composer/bin/phpunit"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.7.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "PHPUnit/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ "",
+ "../../symfony/yaml/"
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }
+ ],
+ "description": "The PHP Unit Testing framework.",
+ "homepage": "http://www.phpunit.de/",
+ "keywords": [
+ "phpunit",
+ "testing",
+ "xunit"
+ ]
+ },
+ {
+ "name": "symfony/class-loader",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
+ "target-dir": "Symfony/Component/ClassLoader",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/ClassLoader.git",
+ "reference": "v2.2.0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0",
+ "reference": "v2.2.0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "symfony/finder": ">=2.0,<3.0"
+ },
+ "time": "2013-03-01 06:43:14",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\ClassLoader\\": ""
+ }
+ },
+ "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 ClassLoader Component",
+ "homepage": "http://symfony.com"
+ },
+ {
+ "name": "symfony/translation",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "target-dir": "Symfony/Component/Translation",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Translation.git",
+ "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/10164d84c407fd9ac5918172f86a4b94bf2b9c0b",
+ "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "symfony/config": ">=2.0,<2.4-dev",
+ "symfony/yaml": ">=2.2,<3.0"
+ },
+ "suggest": {
+ "symfony/config": "2.2.*",
+ "symfony/yaml": "2.2.*"
+ },
+ "time": "2013-02-11 10:13:11",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Translation\\": ""
+ }
+ },
+ "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 Translation Component",
+ "homepage": "http://symfony.com"
+ },
+ {
+ "name": "symfony/validator",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
+ "target-dir": "Symfony/Component/Validator",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Validator.git",
+ "reference": "v2.2.0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.0",
+ "reference": "v2.2.0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/translation": ">=2.0,<3.0"
+ },
+ "require-dev": {
+ "symfony/config": ">=2.2,<2.3-dev",
+ "symfony/http-foundation": ">=2.1,<3.0",
+ "symfony/locale": ">=2.0,<3.0",
+ "symfony/yaml": ">=2.0,<3.0"
+ },
+ "suggest": {
+ "doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/http-foundation": "2.2.*",
"symfony/locale": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "suggest": {
- "doctrine/common": ">=2.1,<2.4-dev",
- "symfony/config": "2.2.*",
- "symfony/http-foundation": "2.2.*",
- "symfony/yaml": "2.2.*"
- },
- "time": "2013-01-21 16:57:12",
+ "time": "2013-02-28 14:29:34",
"type": "library",
"extra": {
"branch-alias": {
@@ -729,18 +1205,18 @@
},
{
"name": "symfony/serializer",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/Serializer",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Serializer",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Serializer.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Serializer/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
@@ -778,32 +1254,32 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
- "url": "https://github.com/symfony/DependencyInjection",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/DependencyInjection.git",
+ "reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/DependencyInjection/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.0-RC3",
+ "reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/config": "2.2.*",
- "symfony/yaml": "2.2.*"
+ "symfony/config": ">=2.2,<2.3-dev",
+ "symfony/yaml": ">=2.0,<3.0"
},
"suggest": {
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
- "time": "2013-01-23 20:21:00",
+ "time": "2013-02-11 11:43:49",
"type": "library",
"extra": {
"branch-alias": {
@@ -1033,482 +1509,5 @@
"http",
"http client"
]
- },
- {
- "name": "symfony/translation",
- "version": "2.2.x-dev",
- "version_normalized": "2.2.9999999.9999999-dev",
- "target-dir": "Symfony/Component/Translation",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Translation",
- "reference": "v2.2.0-RC2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.0-RC2",
- "reference": "v2.2.0-RC2",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/config": ">=2.0,<2.3-dev",
- "symfony/yaml": ">=2.2,<3.0"
- },
- "suggest": {
- "symfony/config": "2.2.*",
- "symfony/yaml": "2.2.*"
- },
- "time": "2013-02-08 16:10:57",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
- "installation-source": "source",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Translation\\": ""
- }
- },
- "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 Translation Component",
- "homepage": "http://symfony.com"
- },
- {
- "name": "phpunit/php-text-template",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/php-text-template.git",
- "reference": "1eeef106193d2f8c539728e566bb4793071a9e18"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18",
- "reference": "1eeef106193d2f8c539728e566bb4793071a9e18",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2013-01-07 10:56:17",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "classmap": [
- "Text/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Simple template engine.",
- "homepage": "https://github.com/sebastianbergmann/php-text-template/",
- "keywords": [
- "template"
- ]
- },
- {
- "name": "phpunit/phpunit-mock-objects",
- "version": "1.2.x-dev",
- "version_normalized": "1.2.9999999.9999999-dev",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4",
- "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "phpunit/php-text-template": ">=1.1.1@stable"
- },
- "suggest": {
- "ext-soap": "*"
- },
- "time": "2013-02-05 07:46:41",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "classmap": [
- "PHPUnit/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Mock Object library for PHPUnit",
- "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
- "keywords": [
- "mock",
- "xunit"
- ]
- },
- {
- "name": "phpunit/php-timer",
- "version": "1.0.x-dev",
- "version_normalized": "1.0.9999999.9999999-dev",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/php-timer.git",
- "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
- "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2013-01-30 06:08:51",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "classmap": [
- "PHP/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Utility class for timing",
- "homepage": "https://github.com/sebastianbergmann/php-timer/",
- "keywords": [
- "timer"
- ]
- },
- {
- "name": "phpunit/php-token-stream",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98",
- "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98",
- "shasum": ""
- },
- "require": {
- "ext-tokenizer": "*",
- "php": ">=5.3.3"
- },
- "time": "2013-01-07 10:56:35",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "classmap": [
- "PHP/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Wrapper around PHP's tokenizer extension.",
- "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
- "keywords": [
- "tokenizer"
- ]
- },
- {
- "name": "phpunit/php-file-iterator",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
- "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2013-01-07 10:47:05",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "classmap": [
- "File/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "FilterIterator implementation that filters files based on a list of suffixes.",
- "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
- "keywords": [
- "filesystem",
- "iterator"
- ]
- },
- {
- "name": "phpunit/php-code-coverage",
- "version": "1.2.x-dev",
- "version_normalized": "1.2.9999999.9999999-dev",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fa8ba7588bdaa48b93cd60629273ee6b9699b280",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "phpunit/php-file-iterator": ">=1.3.0@stable",
- "phpunit/php-text-template": ">=1.1.1@stable",
- "phpunit/php-token-stream": ">=1.1.3@stable"
- },
- "suggest": {
- "ext-dom": "*",
- "ext-xdebug": ">=2.0.5"
- },
- "time": "2013-02-12 10:55:13",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "classmap": [
- "PHP/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
- "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
- "keywords": [
- "coverage",
- "testing",
- "xunit"
- ]
- },
- {
- "name": "phpunit/phpunit",
- "version": "3.7.0",
- "version_normalized": "3.7.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/msonnabaum/phpunit.git",
- "reference": "3.7.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/msonnabaum/phpunit/zipball/3.7.0",
- "reference": "3.7.0",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-pcre": "*",
- "ext-reflection": "*",
- "ext-spl": "*",
- "php": ">=5.3.3",
- "phpunit/php-code-coverage": ">=1.2.0@stable",
- "phpunit/php-file-iterator": ">=1.3.1@stable",
- "phpunit/php-text-template": ">=1.1.1@stable",
- "phpunit/php-timer": ">=1.0.2@stable",
- "phpunit/phpunit-mock-objects": ">=1.2.0@stable",
- "symfony/yaml": ">=2.1.0@stable"
- },
- "suggest": {
- "ext-json": "*",
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "phpunit/php-invoker": ">=1.1.0@stable"
- },
- "time": "2012-09-19 05:07:48",
- "bin": [
- "composer/bin/phpunit"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.7.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "files": [
- "PHPUnit/Autoload.php"
- ]
- },
- "include-path": [
- "",
- "../../symfony/yaml/"
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "The PHP Unit Testing framework.",
- "homepage": "http://www.phpunit.de/",
- "keywords": [
- "phpunit",
- "testing",
- "xunit"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "irc": "irc://irc.freenode.net/phpunit",
- "source": "https://github.com/msonnabaum/phpunit/tree/3.7.0"
- }
- },
- {
- "name": "symfony-cmf/routing",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "target-dir": "Symfony/Cmf/Component/Routing",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony-cmf/Routing",
- "reference": "ea4a10"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/72df1da07b3c4edf16df169fb7987f504070fe0d",
- "reference": "ea4a10",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2",
- "symfony/http-kernel": ">=2.1,<2.3-dev",
- "symfony/routing": ">=2.1,<2.3-dev"
- },
- "time": "2013-01-24 16:09:01",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "installation-source": "source",
- "autoload": {
- "psr-0": {
- "Symfony\\Cmf\\Component\\Routing": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony CMF Community",
- "homepage": "https://github.com/symfony-cmf/Routing/contributors"
- }
- ],
- "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
- "homepage": "http://cmf.symfony.com",
- "keywords": [
- "database",
- "routing"
- ]
}
]
diff --git a/core/vendor/phpunit/php-code-coverage/.travis.yml b/core/vendor/phpunit/php-code-coverage/.travis.yml
index 397c8be45054..35a8eb121ad6 100644
--- a/core/vendor/phpunit/php-code-coverage/.travis.yml
+++ b/core/vendor/phpunit/php-code-coverage/.travis.yml
@@ -11,7 +11,7 @@ before_script:
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-text-template.git vendor/php-text-template
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-token-stream.git vendor/php-token-stream
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-file-iterator.git vendor/php-file-iterator
- - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
+ - git clone --branch=1.0 --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
- git clone --branch=master --depth=100 --quiet git://github.com/pear/pear-core.git vendor/pear-core
- git clone --branch=trunk --depth=100 --quiet git://github.com/pear/Console_Getopt.git vendor/console-getopt
diff --git a/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown b/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
index 273fa0381dc2..83c25db86719 100644
--- a/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
+++ b/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
@@ -3,6 +3,20 @@ PHP_CodeCoverage 1.2
This is the list of changes for the PHP_CodeCoverage 1.2 release series.
+PHP_CodeCoverage 1.2.9
+----------------------
+
+* Improved rendering of "lines covered" numbers for functions and methods with long names or argument lists.
+* Fixed the title of the Y axis of the Code Coverage ./. Cyclomatic Complexity dashboard chart.
+* Upgraded to Highcharts 2.3.5.
+* Upgraded to jQuery 1.9.1.
+
+PHP_CodeCoverage 1.2.8
+----------------------
+
+* Reduced vertical whitespace in sourcecode view.
+* Upgraded to Bootstrap 2.2.2.
+
PHP_CodeCoverage 1.2.7
----------------------
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
index 28bc53c44a6f..3ed476f24177 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
+++ b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
@@ -113,6 +113,7 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
*/
protected function renderItemTemplate(Text_Template $template, array $data)
{
+ $numSeperator = ' / ';
$classesBar = ' ';
$classesLevel = 'None';
$classesNumber = ' ';
@@ -120,7 +121,7 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
if (isset($data['numClasses']) && $data['numClasses'] > 0) {
$classesLevel = $this->getColorLevel($data['testedClassesPercent']);
- $classesNumber = $data['numTestedClasses'] . ' / ' .
+ $classesNumber = $data['numTestedClasses'] . $numSeperator .
$data['numClasses'];
$classesBar = $this->getCoverageBar(
@@ -135,7 +136,7 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
if ($data['numMethods'] > 0) {
$methodsLevel = $this->getColorLevel($data['testedMethodsPercent']);
- $methodsNumber = $data['numTestedMethods'] . ' / ' .
+ $methodsNumber = $data['numTestedMethods'] . $numSeperator .
$data['numMethods'];
$methodsBar = $this->getCoverageBar(
@@ -150,7 +151,7 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
if ($data['numExecutableLines'] > 0) {
$linesLevel = $this->getColorLevel($data['linesExecutedPercent']);
- $linesNumber = $data['numExecutedLines'] . ' / ' .
+ $linesNumber = $data['numExecutedLines'] . $numSeperator .
$data['numExecutableLines'];
$linesBar = $this->getCoverageBar(
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
index eb58b36f9689..d2d911ef7bcf 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
+++ b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
@@ -58,60 +58,60 @@