diff --git a/composer.lock b/composer.lock
index 95301d9bd9b63fb13fa6d84935184dbad94d29a4..131bf0a2f1fd00016fe473b94978f3769a781fb2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1046,7 +1046,7 @@
},
{
"name": "symfony/class-loader",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
@@ -1096,16 +1096,16 @@
},
{
"name": "symfony/console",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8"
+ "reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/9ff9032151186bd66ecee727d728f1319f52d1d8",
- "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8",
+ "url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
+ "reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
"shasum": ""
},
"require": {
@@ -1149,20 +1149,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-09-03 11:40:38"
+ "time": "2015-09-25 08:32:23"
},
{
"name": "symfony/debug",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "726bf9651d29f53243281d0b6418cfaa5e318281"
+ "reference": "c79c361bca8e5ada6a47603875a3c964d03b67b1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/726bf9651d29f53243281d0b6418cfaa5e318281",
- "reference": "726bf9651d29f53243281d0b6418cfaa5e318281",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/c79c361bca8e5ada6a47603875a3c964d03b67b1",
+ "reference": "c79c361bca8e5ada6a47603875a3c964d03b67b1",
"shasum": ""
},
"require": {
@@ -1204,20 +1204,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2015-08-29 11:12:16"
+ "time": "2015-09-14 08:41:38"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "c0a3a97b9450d77cd8eff81c5825efb3624c255b"
+ "reference": "422c3819b110f610d79c6f1dc38af23787dc790e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c0a3a97b9450d77cd8eff81c5825efb3624c255b",
- "reference": "c0a3a97b9450d77cd8eff81c5825efb3624c255b",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/422c3819b110f610d79c6f1dc38af23787dc790e",
+ "reference": "422c3819b110f610d79c6f1dc38af23787dc790e",
"shasum": ""
},
"require": {
@@ -1264,20 +1264,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2015-08-24 07:16:32"
+ "time": "2015-09-15 08:30:42"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa"
+ "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b58c916f1db03a611b72dd702564f30ad8fe83fa",
- "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+ "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
"shasum": ""
},
"require": {
@@ -1322,20 +1322,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2015-08-24 07:13:45"
+ "time": "2015-09-22 13:49:29"
},
{
"name": "symfony/http-foundation",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "7253c2041652353e71560bbd300d6256d170ddaf"
+ "reference": "e1509119f164a0d0a940d7d924d693a7a28a5470"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7253c2041652353e71560bbd300d6256d170ddaf",
- "reference": "7253c2041652353e71560bbd300d6256d170ddaf",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1509119f164a0d0a940d7d924d693a7a28a5470",
+ "reference": "e1509119f164a0d0a940d7d924d693a7a28a5470",
"shasum": ""
},
"require": {
@@ -1375,20 +1375,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2015-08-27 06:45:45"
+ "time": "2015-09-22 13:49:29"
},
{
"name": "symfony/http-kernel",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "fd9c7af92c9e3ade1327cc3af10b17731eebc4a7"
+ "reference": "353aa457424262d7d4e4289ea483145921cffcb5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
- "reference": "fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/353aa457424262d7d4e4289ea483145921cffcb5",
+ "reference": "353aa457424262d7d4e4289ea483145921cffcb5",
"shasum": ""
},
"require": {
@@ -1455,20 +1455,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2015-09-08 14:26:39"
+ "time": "2015-09-25 11:16:52"
},
{
"name": "symfony/process",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "f7b3f73f70a7f8f49a1c838dc3debbf054732d8e"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/f7b3f73f70a7f8f49a1c838dc3debbf054732d8e",
- "reference": "f7b3f73f70a7f8f49a1c838dc3debbf054732d8e",
+ "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
+ "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
"shasum": ""
},
"require": {
@@ -1504,7 +1504,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2015-08-27 06:45:45"
+ "time": "2015-09-19 19:59:23"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -1562,16 +1562,16 @@
},
{
"name": "symfony/routing",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Routing.git",
- "reference": "20b1378cb6efffb77ea0608232f18c8f0dd25109"
+ "url": "https://github.com/symfony/routing.git",
+ "reference": "6c5fae83efa20baf166fcf4582f57094e9f60f16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/20b1378cb6efffb77ea0608232f18c8f0dd25109",
- "reference": "20b1378cb6efffb77ea0608232f18c8f0dd25109",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/6c5fae83efa20baf166fcf4582f57094e9f60f16",
+ "reference": "6c5fae83efa20baf166fcf4582f57094e9f60f16",
"shasum": ""
},
"require": {
@@ -1629,19 +1629,19 @@
"uri",
"url"
],
- "time": "2015-08-24 07:13:45"
+ "time": "2015-09-14 14:14:09"
},
{
"name": "symfony/serializer",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Serializer.git",
+ "url": "https://github.com/symfony/serializer.git",
"reference": "baf24f86a8656eea9c80988f332e51461bfcb67f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/baf24f86a8656eea9c80988f332e51461bfcb67f",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/baf24f86a8656eea9c80988f332e51461bfcb67f",
"reference": "baf24f86a8656eea9c80988f332e51461bfcb67f",
"shasum": ""
},
@@ -1694,15 +1694,15 @@
},
{
"name": "symfony/translation",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Translation.git",
+ "url": "https://github.com/symfony/translation.git",
"reference": "485877661835e188cd78345c6d4eef1290d17571"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/485877661835e188cd78345c6d4eef1290d17571",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/485877661835e188cd78345c6d4eef1290d17571",
"reference": "485877661835e188cd78345c6d4eef1290d17571",
"shasum": ""
},
@@ -1755,16 +1755,16 @@
},
{
"name": "symfony/validator",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Validator.git",
- "reference": "356459a697e26274d44c608513c05c23dc1d8ea7"
+ "url": "https://github.com/symfony/validator.git",
+ "reference": "b359dc71e253ce6eb69eefbd5088032241e7a66f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/356459a697e26274d44c608513c05c23dc1d8ea7",
- "reference": "356459a697e26274d44c608513c05c23dc1d8ea7",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/b359dc71e253ce6eb69eefbd5088032241e7a66f",
+ "reference": "b359dc71e253ce6eb69eefbd5088032241e7a66f",
"shasum": ""
},
"require": {
@@ -1821,20 +1821,20 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
- "time": "2015-09-06 08:36:38"
+ "time": "2015-09-23 11:13:27"
},
{
"name": "symfony/yaml",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "2dc7b06c065df96cc686c66da2705e5e18aef661"
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/2dc7b06c065df96cc686c66da2705e5e18aef661",
- "reference": "2dc7b06c065df96cc686c66da2705e5e18aef661",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+ "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"shasum": ""
},
"require": {
@@ -1870,7 +1870,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-08-24 07:13:45"
+ "time": "2015-09-14 14:14:09"
},
{
"name": "twig/twig",
@@ -3362,7 +3362,7 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
@@ -3417,16 +3417,16 @@
},
{
"name": "symfony/css-selector",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad"
+ "reference": "abe19cc0429a06be0c133056d1f9859854860970"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
- "reference": "ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970",
+ "reference": "abe19cc0429a06be0c133056d1f9859854860970",
"shasum": ""
},
"require": {
@@ -3466,20 +3466,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2015-08-24 07:13:45"
+ "time": "2015-09-22 13:49:29"
},
{
"name": "symfony/dom-crawler",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "2a161e4ee2b2f33d4153be58df4f6f2a5506936e"
+ "reference": "2e185ca136399f902b948694987e62c80099c052"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
- "reference": "2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2e185ca136399f902b948694987e62c80099c052",
+ "reference": "2e185ca136399f902b948694987e62c80099c052",
"shasum": ""
},
"require": {
@@ -3519,7 +3519,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2015-08-26 10:48:03"
+ "time": "2015-09-20 21:13:58"
}
],
"aliases": [],
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 07f2ddc1316c1527a8e2408e2909b8bb0d68011a..660ca8d2d34120a5a5324406da266686b294e510 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2035,97 +2035,106 @@
]
},
{
- "name": "symfony/class-loader",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "twig/twig",
+ "version": "v1.22.2",
+ "version_normalized": "1.22.2.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/class-loader.git",
- "reference": "d957ea6295d7016e20d7eff33a6c1deef819c0d4"
+ "url": "https://github.com/twigphp/Twig.git",
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/class-loader/zipball/d957ea6295d7016e20d7eff33a6c1deef819c0d4",
- "reference": "d957ea6295d7016e20d7eff33a6c1deef819c0d4",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.2.7"
},
"require-dev": {
- "symfony/finder": "~2.0,>=2.0.5",
+ "symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-08-26 17:56:37",
+ "time": "2015-09-22 13:59:32",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.22-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\ClassLoader\\": ""
+ "psr-0": {
+ "Twig_": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Armin Ronacher",
+ "email": "armin.ronacher@active-4.com",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage": "http://twig.sensiolabs.org/contributors",
+ "role": "Contributors"
}
],
- "description": "Symfony ClassLoader Component",
- "homepage": "https://symfony.com"
+ "description": "Twig, the flexible, fast, and secure template language for PHP",
+ "homepage": "http://twig.sensiolabs.org",
+ "keywords": [
+ "templating"
+ ]
},
{
- "name": "symfony/console",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "wikimedia/composer-merge-plugin",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
"source": {
"type": "git",
- "url": "https://github.com/symfony/console.git",
- "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8"
+ "url": "https://github.com/wikimedia/composer-merge-plugin.git",
+ "reference": "47bb3388cfeae41a38087ac8465a7d08fa92ea2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/9ff9032151186bd66ecee727d728f1319f52d1d8",
- "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8",
+ "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/47bb3388cfeae41a38087ac8465a7d08fa92ea2e",
+ "reference": "47bb3388cfeae41a38087ac8465a7d08fa92ea2e",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "composer-plugin-api": "^1.0",
+ "php": ">=5.3.2"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.1"
- },
- "suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/process": ""
+ "composer/composer": "1.0.*@dev",
+ "jakub-onderka/php-parallel-lint": "~0.8",
+ "phpspec/prophecy-phpunit": "~1.0",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "~2.1.0"
},
- "time": "2015-09-03 11:40:38",
- "type": "library",
+ "time": "2015-09-22 21:14:25",
+ "type": "composer-plugin",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
- }
+ "dev-master": "1.3.x-dev"
+ },
+ "class": "Wikimedia\\Composer\\MergePlugin"
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Console\\": ""
+ "Wikimedia\\Composer\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2134,49 +2143,47 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Bryan Davis",
+ "email": "bd808@wikimedia.org"
}
],
- "description": "Symfony Console Component",
- "homepage": "https://symfony.com"
+ "description": "Composer plugin to merge multiple composer.json files"
},
{
- "name": "symfony/css-selector",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "composer/installers",
+ "version": "v1.0.21",
+ "version_normalized": "1.0.21.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/css-selector.git",
- "reference": "ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad"
+ "url": "https://github.com/composer/installers.git",
+ "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
- "reference": "ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
+ "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+ "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
"shasum": ""
},
- "require": {
- "php": ">=5.3.9"
+ "replace": {
+ "roundcube/plugin-installer": "*",
+ "shama/baton": "*"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "composer/composer": "1.0.*@dev",
+ "phpunit/phpunit": "4.1.*"
},
- "time": "2015-08-24 07:13:45",
- "type": "library",
+ "time": "2015-02-18 17:17:01",
+ "type": "composer-installer",
"extra": {
+ "class": "Composer\\Installers\\Installer",
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.0-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
+ "psr-0": {
+ "Composer\\Installers\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2185,64 +2192,99 @@
],
"authors": [
{
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Kyle Robinson Young",
+ "email": "kyle@dontkry.com",
+ "homepage": "https://github.com/shama"
}
],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com"
+ "description": "A multi-framework Composer library installer",
+ "homepage": "http://composer.github.com/installers/",
+ "keywords": [
+ "Craft",
+ "Dolibarr",
+ "Hurad",
+ "MODX Evo",
+ "OXID",
+ "SMF",
+ "Thelia",
+ "WolfCMS",
+ "agl",
+ "aimeos",
+ "annotatecms",
+ "bitrix",
+ "cakephp",
+ "chef",
+ "codeigniter",
+ "concrete5",
+ "croogo",
+ "dokuwiki",
+ "drupal",
+ "elgg",
+ "fuelphp",
+ "grav",
+ "installer",
+ "joomla",
+ "kohana",
+ "laravel",
+ "lithium",
+ "magento",
+ "mako",
+ "mediawiki",
+ "modulework",
+ "moodle",
+ "phpbb",
+ "piwik",
+ "ppi",
+ "puppet",
+ "roundcube",
+ "shopware",
+ "silverstripe",
+ "symfony",
+ "typo3",
+ "wordpress",
+ "zend",
+ "zikula"
+ ]
},
{
- "name": "symfony/dependency-injection",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "behat/mink",
+ "version": "v1.7.0",
+ "version_normalized": "1.7.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/dependency-injection.git",
- "reference": "c0a3a97b9450d77cd8eff81c5825efb3624c255b"
+ "url": "https://github.com/minkphp/Mink.git",
+ "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c0a3a97b9450d77cd8eff81c5825efb3624c255b",
- "reference": "c0a3a97b9450d77cd8eff81c5825efb3624c255b",
+ "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf",
+ "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
- },
- "conflict": {
- "symfony/expression-language": "<2.6"
+ "php": ">=5.3.1",
+ "symfony/css-selector": "~2.1"
},
"require-dev": {
- "symfony/config": "~2.2",
- "symfony/expression-language": "~2.6",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.1"
+ "symfony/phpunit-bridge": "~2.7"
},
"suggest": {
- "symfony/config": "",
- "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
- "symfony/yaml": ""
+ "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
+ "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+ "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
+ "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
},
- "time": "2015-08-24 07:16:32",
+ "time": "2015-09-20 20:24:03",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.7.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\DependencyInjection\\": ""
+ "Behat\\Mink\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2251,55 +2293,55 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
}
],
- "description": "Symfony DependencyInjection Component",
- "homepage": "https://symfony.com"
+ "description": "Browser controller/emulator abstraction for PHP",
+ "homepage": "http://mink.behat.org/",
+ "keywords": [
+ "browser",
+ "testing",
+ "web"
+ ]
},
{
- "name": "symfony/debug",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "behat/mink-browserkit-driver",
+ "version": "v1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/debug.git",
- "reference": "726bf9651d29f53243281d0b6418cfaa5e318281"
+ "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
+ "reference": "da47df1593dac132f04d24e7277ef40d33d9f201"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/726bf9651d29f53243281d0b6418cfaa5e318281",
- "reference": "726bf9651d29f53243281d0b6418cfaa5e318281",
+ "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201",
+ "reference": "da47df1593dac132f04d24e7277ef40d33d9f201",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "psr/log": "~1.0"
- },
- "conflict": {
- "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+ "behat/mink": "~1.7@dev",
+ "php": ">=5.3.6",
+ "symfony/browser-kit": "~2.3",
+ "symfony/dom-crawler": "~2.3"
},
"require-dev": {
- "symfony/class-loader": "~2.2",
- "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
+ "silex/silex": "~1.2",
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-08-29 11:12:16",
- "type": "library",
+ "time": "2015-09-21 20:56:13",
+ "type": "mink-driver",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.3.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Debug\\": ""
+ "Behat\\Mink\\Driver\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2308,54 +2350,56 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
}
],
- "description": "Symfony Debug Component",
- "homepage": "https://symfony.com"
+ "description": "Symfony2 BrowserKit driver for Mink framework",
+ "homepage": "http://mink.behat.org/",
+ "keywords": [
+ "Mink",
+ "Symfony2",
+ "browser",
+ "testing"
+ ]
},
{
- "name": "symfony/http-foundation",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "behat/mink-goutte-driver",
+ "version": "v1.2.0",
+ "version_normalized": "1.2.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-foundation.git",
- "reference": "7253c2041652353e71560bbd300d6256d170ddaf"
+ "url": "https://github.com/minkphp/MinkGoutteDriver.git",
+ "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7253c2041652353e71560bbd300d6256d170ddaf",
- "reference": "7253c2041652353e71560bbd300d6256d170ddaf",
+ "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f",
+ "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "behat/mink": "~1.6@dev",
+ "behat/mink-browserkit-driver": "~1.2@dev",
+ "fabpot/goutte": "~1.0.4|~2.0|~3.1",
+ "php": ">=5.3.1"
},
"require-dev": {
- "symfony/expression-language": "~2.4",
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-08-27 06:45:45",
- "type": "library",
+ "time": "2015-09-21 21:31:11",
+ "type": "mink-driver",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.2.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\HttpFoundation\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
+ "Behat\\Mink\\Driver\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2363,338 +2407,290 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
}
],
- "description": "Symfony HttpFoundation Component",
- "homepage": "https://symfony.com"
+ "description": "Goutte driver for Mink framework",
+ "homepage": "http://mink.behat.org/",
+ "keywords": [
+ "browser",
+ "goutte",
+ "headless",
+ "testing"
+ ]
},
{
- "name": "symfony/event-dispatcher",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "phpunit/phpunit-mock-objects",
+ "version": "2.3.8",
+ "version_normalized": "2.3.8.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa"
+ "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+ "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b58c916f1db03a611b72dd702564f30ad8fe83fa",
- "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "doctrine/instantiator": "^1.0.2",
+ "php": ">=5.3.3",
+ "phpunit/php-text-template": "~1.2",
+ "sebastian/exporter": "~1.2"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.6",
- "symfony/expression-language": "~2.6",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/stopwatch": "~2.3"
+ "phpunit/phpunit": "~4.4"
},
"suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "ext-soap": "*"
},
- "time": "2015-08-24 07:13:45",
+ "time": "2015-10-02 06:51:40",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.3.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\EventDispatcher\\": ""
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
}
],
- "description": "Symfony EventDispatcher Component",
- "homepage": "https://symfony.com"
+ "description": "Mock Object library for PHPUnit",
+ "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+ "keywords": [
+ "mock",
+ "xunit"
+ ]
},
{
- "name": "symfony/http-kernel",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "phpunit/php-token-stream",
+ "version": "1.4.8",
+ "version_normalized": "1.4.8.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-kernel.git",
- "reference": "fd9c7af92c9e3ade1327cc3af10b17731eebc4a7"
+ "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
- "reference": "fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "psr/log": "~1.0",
- "symfony/debug": "~2.6,>=2.6.2",
- "symfony/event-dispatcher": "~2.6,>=2.6.7",
- "symfony/http-foundation": "~2.5,>=2.5.4"
- },
- "conflict": {
- "symfony/config": "<2.7"
+ "ext-tokenizer": "*",
+ "php": ">=5.3.3"
},
"require-dev": {
- "symfony/browser-kit": "~2.3",
- "symfony/class-loader": "~2.1",
- "symfony/config": "~2.7",
- "symfony/console": "~2.3",
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.2",
- "symfony/dom-crawler": "~2.0,>=2.0.5",
- "symfony/expression-language": "~2.4",
- "symfony/finder": "~2.0,>=2.0.5",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/routing": "~2.2",
- "symfony/stopwatch": "~2.3",
- "symfony/templating": "~2.2",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/var-dumper": "~2.6"
- },
- "suggest": {
- "symfony/browser-kit": "",
- "symfony/class-loader": "",
- "symfony/config": "",
- "symfony/console": "",
- "symfony/dependency-injection": "",
- "symfony/finder": "",
- "symfony/var-dumper": ""
+ "phpunit/phpunit": "~4.2"
},
- "time": "2015-09-08 14:26:39",
+ "time": "2015-09-15 10:49:45",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.4-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\HttpKernel\\": ""
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
}
],
- "description": "Symfony HttpKernel Component",
- "homepage": "https://symfony.com"
+ "description": "Wrapper around PHP's tokenizer extension.",
+ "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+ "keywords": [
+ "tokenizer"
+ ]
},
{
- "name": "symfony/routing",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "phpunit/php-code-coverage",
+ "version": "2.2.3",
+ "version_normalized": "2.2.3.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Routing.git",
- "reference": "20b1378cb6efffb77ea0608232f18c8f0dd25109"
+ "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+ "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/20b1378cb6efffb77ea0608232f18c8f0dd25109",
- "reference": "20b1378cb6efffb77ea0608232f18c8f0dd25109",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
+ "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
- },
- "conflict": {
- "symfony/config": "<2.7"
+ "php": ">=5.3.3",
+ "phpunit/php-file-iterator": "~1.3",
+ "phpunit/php-text-template": "~1.2",
+ "phpunit/php-token-stream": "~1.3",
+ "sebastian/environment": "^1.3.2",
+ "sebastian/version": "~1.0"
},
"require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/common": "~2.2",
- "psr/log": "~1.0",
- "symfony/config": "~2.7",
- "symfony/expression-language": "~2.4",
- "symfony/http-foundation": "~2.3",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.0,>=2.0.5"
+ "ext-xdebug": ">=2.1.4",
+ "phpunit/phpunit": "~4"
},
"suggest": {
- "doctrine/annotations": "For using the annotation loader",
- "symfony/config": "For using the all-in-one router or any loader",
- "symfony/expression-language": "For using expression matching",
- "symfony/yaml": "For using the YAML loader"
+ "ext-dom": "*",
+ "ext-xdebug": ">=2.2.1",
+ "ext-xmlwriter": "*"
},
- "time": "2015-08-24 07:13:45",
+ "time": "2015-09-14 06:51:16",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.2.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\Routing\\": ""
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
}
],
- "description": "Symfony Routing Component",
- "homepage": "https://symfony.com",
+ "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+ "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
"keywords": [
- "router",
- "routing",
- "uri",
- "url"
+ "coverage",
+ "testing",
+ "xunit"
]
},
{
- "name": "symfony/serializer",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "phpunit/phpunit",
+ "version": "4.8.10",
+ "version_normalized": "4.8.10.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Serializer.git",
- "reference": "baf24f86a8656eea9c80988f332e51461bfcb67f"
+ "url": "https://github.com/sebastianbergmann/phpunit.git",
+ "reference": "463163747474815c5ccd4ae12b5b355ec12158e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/baf24f86a8656eea9c80988f332e51461bfcb67f",
- "reference": "baf24f86a8656eea9c80988f332e51461bfcb67f",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/463163747474815c5ccd4ae12b5b355ec12158e8",
+ "reference": "463163747474815c5ccd4ae12b5b355ec12158e8",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
- },
- "require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/cache": "~1.0",
- "symfony/config": "~2.2",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/property-access": "~2.3",
- "symfony/yaml": "~2.0,>=2.0.5"
+ "ext-dom": "*",
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-reflection": "*",
+ "ext-spl": "*",
+ "php": ">=5.3.3",
+ "phpspec/prophecy": "^1.3.1",
+ "phpunit/php-code-coverage": "~2.1",
+ "phpunit/php-file-iterator": "~1.4",
+ "phpunit/php-text-template": "~1.2",
+ "phpunit/php-timer": ">=1.0.6",
+ "phpunit/phpunit-mock-objects": "~2.3",
+ "sebastian/comparator": "~1.1",
+ "sebastian/diff": "~1.2",
+ "sebastian/environment": "~1.3",
+ "sebastian/exporter": "~1.2",
+ "sebastian/global-state": "~1.0",
+ "sebastian/version": "~1.0",
+ "symfony/yaml": "~2.1|~3.0"
},
"suggest": {
- "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
- "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
- "symfony/config": "For using the XML mapping loader.",
- "symfony/property-access": "For using the ObjectNormalizer.",
- "symfony/yaml": "For using the default YAML mapping loader."
+ "phpunit/php-invoker": "~1.1"
},
- "time": "2015-08-31 16:44:53",
+ "time": "2015-10-01 09:14:30",
+ "bin": [
+ "phpunit"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "4.8.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\Serializer\\": ""
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
- "description": "Symfony Serializer Component",
- "homepage": "https://symfony.com"
+ "description": "The PHP Unit Testing framework.",
+ "homepage": "https://phpunit.de/",
+ "keywords": [
+ "phpunit",
+ "testing",
+ "xunit"
+ ]
},
{
- "name": "symfony/validator",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "symfony/class-loader",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Validator.git",
- "reference": "356459a697e26274d44c608513c05c23dc1d8ea7"
+ "url": "https://github.com/symfony/class-loader.git",
+ "reference": "d957ea6295d7016e20d7eff33a6c1deef819c0d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/356459a697e26274d44c608513c05c23dc1d8ea7",
- "reference": "356459a697e26274d44c608513c05c23dc1d8ea7",
+ "url": "https://api.github.com/repos/symfony/class-loader/zipball/d957ea6295d7016e20d7eff33a6c1deef819c0d4",
+ "reference": "d957ea6295d7016e20d7eff33a6c1deef819c0d4",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "symfony/translation": "~2.4"
+ "php": ">=5.3.9"
},
"require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/cache": "~1.0",
- "egulias/email-validator": "~1.2,>=1.2.1",
- "symfony/config": "~2.2",
- "symfony/expression-language": "~2.4",
- "symfony/http-foundation": "~2.1",
- "symfony/intl": "~2.4",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/property-access": "~2.3",
- "symfony/yaml": "~2.0,>=2.0.5"
- },
- "suggest": {
- "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
- "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
- "egulias/email-validator": "Strict (RFC compliant) email validation",
- "symfony/config": "",
- "symfony/expression-language": "For using the 2.4 Expression validator",
- "symfony/http-foundation": "",
- "symfony/intl": "",
- "symfony/property-access": "For using the 2.4 Validator API",
- "symfony/yaml": ""
+ "symfony/finder": "~2.0,>=2.0.5",
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-06 08:36:38",
+ "time": "2015-08-26 17:56:37",
"type": "library",
"extra": {
"branch-alias": {
@@ -2704,7 +2700,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Validator\\": ""
+ "Symfony\\Component\\ClassLoader\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2721,31 +2717,39 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Validator Component",
+ "description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/process",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "symfony/console",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "f7b3f73f70a7f8f49a1c838dc3debbf054732d8e"
+ "url": "https://github.com/symfony/console.git",
+ "reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/f7b3f73f70a7f8f49a1c838dc3debbf054732d8e",
- "reference": "f7b3f73f70a7f8f49a1c838dc3debbf054732d8e",
+ "url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
+ "reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "psr/log": "~1.0",
+ "symfony/event-dispatcher": "~2.1",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.1"
+ },
+ "suggest": {
+ "psr/log": "For using the console logger",
+ "symfony/event-dispatcher": "",
+ "symfony/process": ""
},
- "time": "2015-08-27 06:45:45",
+ "time": "2015-09-25 08:32:23",
"type": "library",
"extra": {
"branch-alias": {
@@ -2755,7 +2759,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Process\\": ""
+ "Symfony\\Component\\Console\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2772,31 +2776,42 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Process Component",
+ "description": "Symfony Console Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/yaml",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "symfony/dependency-injection",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "2dc7b06c065df96cc686c66da2705e5e18aef661"
+ "url": "https://github.com/symfony/dependency-injection.git",
+ "reference": "422c3819b110f610d79c6f1dc38af23787dc790e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/2dc7b06c065df96cc686c66da2705e5e18aef661",
- "reference": "2dc7b06c065df96cc686c66da2705e5e18aef661",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/422c3819b110f610d79c6f1dc38af23787dc790e",
+ "reference": "422c3819b110f610d79c6f1dc38af23787dc790e",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
+ "conflict": {
+ "symfony/expression-language": "<2.6"
+ },
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/config": "~2.2",
+ "symfony/expression-language": "~2.6",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/yaml": "~2.1"
+ },
+ "suggest": {
+ "symfony/config": "",
+ "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+ "symfony/yaml": ""
},
- "time": "2015-08-24 07:13:45",
+ "time": "2015-09-15 08:30:42",
"type": "library",
"extra": {
"branch-alias": {
@@ -2806,7 +2821,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Yaml\\": ""
+ "Symfony\\Component\\DependencyInjection\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2823,35 +2838,37 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Yaml Component",
+ "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/dom-crawler",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "symfony/debug",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/dom-crawler.git",
- "reference": "2a161e4ee2b2f33d4153be58df4f6f2a5506936e"
+ "url": "https://github.com/symfony/debug.git",
+ "reference": "c79c361bca8e5ada6a47603875a3c964d03b67b1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
- "reference": "2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/c79c361bca8e5ada6a47603875a3c964d03b67b1",
+ "reference": "c79c361bca8e5ada6a47603875a3c964d03b67b1",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.9",
+ "psr/log": "~1.0"
+ },
+ "conflict": {
+ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
- "symfony/css-selector": "~2.3",
+ "symfony/class-loader": "~2.2",
+ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
"symfony/phpunit-bridge": "~2.7"
},
- "suggest": {
- "symfony/css-selector": ""
- },
- "time": "2015-08-26 10:48:03",
+ "time": "2015-09-14 08:41:38",
"type": "library",
"extra": {
"branch-alias": {
@@ -2861,7 +2878,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\DomCrawler\\": ""
+ "Symfony\\Component\\Debug\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2878,37 +2895,32 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony DomCrawler Component",
+ "description": "Symfony Debug Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/browser-kit",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "symfony/http-foundation",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/browser-kit.git",
- "reference": "277a2457776d4cc25706fbdd9d1e4ab2dac884e4"
+ "url": "https://github.com/symfony/http-foundation.git",
+ "reference": "e1509119f164a0d0a940d7d924d693a7a28a5470"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
- "reference": "277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1509119f164a0d0a940d7d924d693a7a28a5470",
+ "reference": "e1509119f164a0d0a940d7d924d693a7a28a5470",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "symfony/dom-crawler": "~2.0,>=2.0.5"
+ "php": ">=5.3.9"
},
"require-dev": {
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5"
- },
- "suggest": {
- "symfony/process": ""
+ "symfony/expression-language": "~2.4",
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-06 08:36:38",
+ "time": "2015-09-22 13:49:29",
"type": "library",
"extra": {
"branch-alias": {
@@ -2918,8 +2930,11 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\BrowserKit\\": ""
- }
+ "Symfony\\Component\\HttpFoundation\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2935,43 +2950,40 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony BrowserKit Component",
+ "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/translation",
- "version": "v2.7.4",
- "version_normalized": "2.7.4.0",
+ "name": "symfony/event-dispatcher",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Translation.git",
- "reference": "485877661835e188cd78345c6d4eef1290d17571"
+ "url": "https://github.com/symfony/event-dispatcher.git",
+ "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/485877661835e188cd78345c6d4eef1290d17571",
- "reference": "485877661835e188cd78345c6d4eef1290d17571",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+ "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "conflict": {
- "symfony/config": "<2.7"
- },
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.7",
- "symfony/intl": "~2.4",
+ "symfony/config": "~2.0,>=2.0.5",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
"symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.2"
+ "symfony/stopwatch": "~2.3"
},
"suggest": {
- "psr/log": "To use logging capability in translator",
- "symfony/config": "",
- "symfony/yaml": ""
+ "symfony/dependency-injection": "",
+ "symfony/http-kernel": ""
},
- "time": "2015-09-06 08:36:38",
+ "time": "2015-09-22 13:49:29",
"type": "library",
"extra": {
"branch-alias": {
@@ -2981,7 +2993,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Translation\\": ""
+ "Symfony\\Component\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2998,110 +3010,139 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Translation Component",
+ "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com"
},
{
- "name": "twig/twig",
- "version": "v1.22.2",
- "version_normalized": "1.22.2.0",
+ "name": "symfony/http-kernel",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/twigphp/Twig.git",
- "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a"
+ "url": "https://github.com/symfony/http-kernel.git",
+ "reference": "353aa457424262d7d4e4289ea483145921cffcb5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
- "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/353aa457424262d7d4e4289ea483145921cffcb5",
+ "reference": "353aa457424262d7d4e4289ea483145921cffcb5",
"shasum": ""
},
"require": {
- "php": ">=5.2.7"
- },
- "require-dev": {
- "symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~2.7"
+ "php": ">=5.3.9",
+ "psr/log": "~1.0",
+ "symfony/debug": "~2.6,>=2.6.2",
+ "symfony/event-dispatcher": "~2.6,>=2.6.7",
+ "symfony/http-foundation": "~2.5,>=2.5.4"
},
- "time": "2015-09-22 13:59:32",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.22-dev"
- }
+ "conflict": {
+ "symfony/config": "<2.7"
+ },
+ "require-dev": {
+ "symfony/browser-kit": "~2.3",
+ "symfony/class-loader": "~2.1",
+ "symfony/config": "~2.7",
+ "symfony/console": "~2.3",
+ "symfony/css-selector": "~2.0,>=2.0.5",
+ "symfony/dependency-injection": "~2.2",
+ "symfony/dom-crawler": "~2.0,>=2.0.5",
+ "symfony/expression-language": "~2.4",
+ "symfony/finder": "~2.0,>=2.0.5",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.0,>=2.0.5",
+ "symfony/routing": "~2.2",
+ "symfony/stopwatch": "~2.3",
+ "symfony/templating": "~2.2",
+ "symfony/translation": "~2.0,>=2.0.5",
+ "symfony/var-dumper": "~2.6"
+ },
+ "suggest": {
+ "symfony/browser-kit": "",
+ "symfony/class-loader": "",
+ "symfony/config": "",
+ "symfony/console": "",
+ "symfony/dependency-injection": "",
+ "symfony/finder": "",
+ "symfony/var-dumper": ""
+ },
+ "time": "2015-09-25 11:16:52",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Twig_": "lib/"
+ "psr-4": {
+ "Symfony\\Component\\HttpKernel\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
- {
- "name": "Armin Ronacher",
- "email": "armin.ronacher@active-4.com",
- "role": "Project Founder"
+ "email": "fabien@symfony.com"
},
{
- "name": "Twig Team",
- "homepage": "http://twig.sensiolabs.org/contributors",
- "role": "Contributors"
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Twig, the flexible, fast, and secure template language for PHP",
- "homepage": "http://twig.sensiolabs.org",
- "keywords": [
- "templating"
- ]
+ "description": "Symfony HttpKernel Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "wikimedia/composer-merge-plugin",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
+ "name": "symfony/routing",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/wikimedia/composer-merge-plugin.git",
- "reference": "47bb3388cfeae41a38087ac8465a7d08fa92ea2e"
+ "url": "https://github.com/symfony/routing.git",
+ "reference": "6c5fae83efa20baf166fcf4582f57094e9f60f16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/47bb3388cfeae41a38087ac8465a7d08fa92ea2e",
- "reference": "47bb3388cfeae41a38087ac8465a7d08fa92ea2e",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/6c5fae83efa20baf166fcf4582f57094e9f60f16",
+ "reference": "6c5fae83efa20baf166fcf4582f57094e9f60f16",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0",
- "php": ">=5.3.2"
+ "php": ">=5.3.9"
+ },
+ "conflict": {
+ "symfony/config": "<2.7"
},
"require-dev": {
- "composer/composer": "1.0.*@dev",
- "jakub-onderka/php-parallel-lint": "~0.8",
- "phpspec/prophecy-phpunit": "~1.0",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.1.0"
+ "doctrine/annotations": "~1.0",
+ "doctrine/common": "~2.2",
+ "psr/log": "~1.0",
+ "symfony/config": "~2.7",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.3",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/yaml": "~2.0,>=2.0.5"
},
- "time": "2015-09-22 21:14:25",
- "type": "composer-plugin",
+ "suggest": {
+ "doctrine/annotations": "For using the annotation loader",
+ "symfony/config": "For using the all-in-one router or any loader",
+ "symfony/expression-language": "For using expression matching",
+ "symfony/yaml": "For using the YAML loader"
+ },
+ "time": "2015-09-14 14:14:09",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
- },
- "class": "Wikimedia\\Composer\\MergePlugin"
+ "dev-master": "2.7-dev"
+ }
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Wikimedia\\Composer\\": "src/"
+ "Symfony\\Component\\Routing\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3110,47 +3151,67 @@
],
"authors": [
{
- "name": "Bryan Davis",
- "email": "bd808@wikimedia.org"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Composer plugin to merge multiple composer.json files"
+ "description": "Symfony Routing Component",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "router",
+ "routing",
+ "uri",
+ "url"
+ ]
},
{
- "name": "composer/installers",
- "version": "v1.0.21",
- "version_normalized": "1.0.21.0",
+ "name": "symfony/serializer",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/composer/installers.git",
- "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
+ "url": "https://github.com/symfony/serializer.git",
+ "reference": "baf24f86a8656eea9c80988f332e51461bfcb67f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
- "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/baf24f86a8656eea9c80988f332e51461bfcb67f",
+ "reference": "baf24f86a8656eea9c80988f332e51461bfcb67f",
"shasum": ""
},
- "replace": {
- "roundcube/plugin-installer": "*",
- "shama/baton": "*"
+ "require": {
+ "php": ">=5.3.9"
},
"require-dev": {
- "composer/composer": "1.0.*@dev",
- "phpunit/phpunit": "4.1.*"
+ "doctrine/annotations": "~1.0",
+ "doctrine/cache": "~1.0",
+ "symfony/config": "~2.2",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/property-access": "~2.3",
+ "symfony/yaml": "~2.0,>=2.0.5"
},
- "time": "2015-02-18 17:17:01",
- "type": "composer-installer",
+ "suggest": {
+ "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+ "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+ "symfony/config": "For using the XML mapping loader.",
+ "symfony/property-access": "For using the ObjectNormalizer.",
+ "symfony/yaml": "For using the default YAML mapping loader."
+ },
+ "time": "2015-08-31 16:44:53",
+ "type": "library",
"extra": {
- "class": "Composer\\Installers\\Installer",
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Composer\\Installers\\": "src/"
+ "psr-4": {
+ "Symfony\\Component\\Serializer\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3159,99 +3220,61 @@
],
"authors": [
{
- "name": "Kyle Robinson Young",
- "email": "kyle@dontkry.com",
- "homepage": "https://github.com/shama"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "A multi-framework Composer library installer",
- "homepage": "http://composer.github.com/installers/",
- "keywords": [
- "Craft",
- "Dolibarr",
- "Hurad",
- "MODX Evo",
- "OXID",
- "SMF",
- "Thelia",
- "WolfCMS",
- "agl",
- "aimeos",
- "annotatecms",
- "bitrix",
- "cakephp",
- "chef",
- "codeigniter",
- "concrete5",
- "croogo",
- "dokuwiki",
- "drupal",
- "elgg",
- "fuelphp",
- "grav",
- "installer",
- "joomla",
- "kohana",
- "laravel",
- "lithium",
- "magento",
- "mako",
- "mediawiki",
- "modulework",
- "moodle",
- "phpbb",
- "piwik",
- "ppi",
- "puppet",
- "roundcube",
- "shopware",
- "silverstripe",
- "symfony",
- "typo3",
- "wordpress",
- "zend",
- "zikula"
- ]
+ "description": "Symfony Serializer Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "behat/mink",
- "version": "v1.7.0",
- "version_normalized": "1.7.0.0",
+ "name": "symfony/translation",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/minkphp/Mink.git",
- "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf"
+ "url": "https://github.com/symfony/translation.git",
+ "reference": "485877661835e188cd78345c6d4eef1290d17571"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf",
- "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/485877661835e188cd78345c6d4eef1290d17571",
+ "reference": "485877661835e188cd78345c6d4eef1290d17571",
"shasum": ""
},
"require": {
- "php": ">=5.3.1",
- "symfony/css-selector": "~2.1"
+ "php": ">=5.3.9"
+ },
+ "conflict": {
+ "symfony/config": "<2.7"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "psr/log": "~1.0",
+ "symfony/config": "~2.7",
+ "symfony/intl": "~2.4",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/yaml": "~2.2"
},
"suggest": {
- "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
- "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
- "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
- "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
+ "psr/log": "To use logging capability in translator",
+ "symfony/config": "",
+ "symfony/yaml": ""
},
- "time": "2015-09-20 20:24:03",
+ "time": "2015-09-06 08:36:38",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Behat\\Mink\\": "src/"
+ "Symfony\\Component\\Translation\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3260,55 +3283,70 @@
],
"authors": [
{
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Browser controller/emulator abstraction for PHP",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "browser",
- "testing",
- "web"
- ]
+ "description": "Symfony Translation Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "behat/mink-browserkit-driver",
- "version": "v1.3.0",
- "version_normalized": "1.3.0.0",
+ "name": "symfony/validator",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
- "reference": "da47df1593dac132f04d24e7277ef40d33d9f201"
+ "url": "https://github.com/symfony/validator.git",
+ "reference": "b359dc71e253ce6eb69eefbd5088032241e7a66f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201",
- "reference": "da47df1593dac132f04d24e7277ef40d33d9f201",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/b359dc71e253ce6eb69eefbd5088032241e7a66f",
+ "reference": "b359dc71e253ce6eb69eefbd5088032241e7a66f",
"shasum": ""
},
"require": {
- "behat/mink": "~1.7@dev",
- "php": ">=5.3.6",
- "symfony/browser-kit": "~2.3",
- "symfony/dom-crawler": "~2.3"
+ "php": ">=5.3.9",
+ "symfony/translation": "~2.4"
},
"require-dev": {
- "silex/silex": "~1.2",
- "symfony/phpunit-bridge": "~2.7"
+ "doctrine/annotations": "~1.0",
+ "doctrine/cache": "~1.0",
+ "egulias/email-validator": "~1.2,>=1.2.1",
+ "symfony/config": "~2.2",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.1",
+ "symfony/intl": "~2.4",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/property-access": "~2.3",
+ "symfony/yaml": "~2.0,>=2.0.5"
},
- "time": "2015-09-21 20:56:13",
- "type": "mink-driver",
+ "suggest": {
+ "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+ "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+ "egulias/email-validator": "Strict (RFC compliant) email validation",
+ "symfony/config": "",
+ "symfony/expression-language": "For using the 2.4 Expression validator",
+ "symfony/http-foundation": "",
+ "symfony/intl": "",
+ "symfony/property-access": "For using the 2.4 Validator API",
+ "symfony/yaml": ""
+ },
+ "time": "2015-09-23 11:13:27",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Behat\\Mink\\Driver\\": "src/"
+ "Symfony\\Component\\Validator\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3317,55 +3355,49 @@
],
"authors": [
{
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony2 BrowserKit driver for Mink framework",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "Mink",
- "Symfony2",
- "browser",
- "testing"
- ]
+ "description": "Symfony Validator Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "behat/mink-goutte-driver",
- "version": "v1.2.0",
- "version_normalized": "1.2.0.0",
+ "name": "symfony/process",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/minkphp/MinkGoutteDriver.git",
- "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f",
- "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f",
+ "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
+ "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
"shasum": ""
},
"require": {
- "behat/mink": "~1.6@dev",
- "behat/mink-browserkit-driver": "~1.2@dev",
- "fabpot/goutte": "~1.0.4|~2.0|~3.1",
- "php": ">=5.3.1"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-21 21:31:11",
- "type": "mink-driver",
+ "time": "2015-09-19 19:59:23",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Behat\\Mink\\Driver\\": "src/"
+ "Symfony\\Component\\Process\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3374,265 +3406,233 @@
],
"authors": [
{
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Goutte driver for Mink framework",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "browser",
- "goutte",
- "headless",
- "testing"
- ]
+ "description": "Symfony Process Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "phpunit/phpunit-mock-objects",
- "version": "2.3.8",
- "version_normalized": "2.3.8.0",
+ "name": "symfony/yaml",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+ "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.0.2",
- "php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2",
- "sebastian/exporter": "~1.2"
+ "php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
- },
- "suggest": {
- "ext-soap": "*"
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-10-02 06:51:40",
+ "time": "2015-09-14 14:14:09",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "Symfony\\Component\\Yaml\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Mock Object library for PHPUnit",
- "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
- "keywords": [
- "mock",
- "xunit"
- ]
+ "description": "Symfony Yaml Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "phpunit/php-token-stream",
- "version": "1.4.8",
- "version_normalized": "1.4.8.0",
+ "name": "symfony/css-selector",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "abe19cc0429a06be0c133056d1f9859854860970"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970",
+ "reference": "abe19cc0429a06be0c133056d1f9859854860970",
"shasum": ""
},
"require": {
- "ext-tokenizer": "*",
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "~4.2"
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-15 10:49:45",
+ "time": "2015-09-22 13:49:29",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "Symfony\\Component\\CssSelector\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Wrapper around PHP's tokenizer extension.",
- "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
- "keywords": [
- "tokenizer"
- ]
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "phpunit/php-code-coverage",
- "version": "2.2.3",
- "version_normalized": "2.2.3.0",
+ "name": "symfony/dom-crawler",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
+ "url": "https://github.com/symfony/dom-crawler.git",
+ "reference": "2e185ca136399f902b948694987e62c80099c052"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
- "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2e185ca136399f902b948694987e62c80099c052",
+ "reference": "2e185ca136399f902b948694987e62c80099c052",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "phpunit/php-file-iterator": "~1.3",
- "phpunit/php-text-template": "~1.2",
- "phpunit/php-token-stream": "~1.3",
- "sebastian/environment": "^1.3.2",
- "sebastian/version": "~1.0"
+ "php": ">=5.3.9"
},
"require-dev": {
- "ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "~4"
+ "symfony/css-selector": "~2.3",
+ "symfony/phpunit-bridge": "~2.7"
},
"suggest": {
- "ext-dom": "*",
- "ext-xdebug": ">=2.2.1",
- "ext-xmlwriter": "*"
+ "symfony/css-selector": ""
},
- "time": "2015-09-14 06:51:16",
+ "time": "2015-09-20 21:13:58",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "Symfony\\Component\\DomCrawler\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "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"
- ]
+ "description": "Symfony DomCrawler Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "phpunit/phpunit",
- "version": "4.8.10",
- "version_normalized": "4.8.10.0",
+ "name": "symfony/browser-kit",
+ "version": "v2.7.5",
+ "version_normalized": "2.7.5.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "463163747474815c5ccd4ae12b5b355ec12158e8"
+ "url": "https://github.com/symfony/browser-kit.git",
+ "reference": "277a2457776d4cc25706fbdd9d1e4ab2dac884e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/463163747474815c5ccd4ae12b5b355ec12158e8",
- "reference": "463163747474815c5ccd4ae12b5b355ec12158e8",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
+ "reference": "277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
"shasum": ""
},
"require": {
- "ext-dom": "*",
- "ext-json": "*",
- "ext-pcre": "*",
- "ext-reflection": "*",
- "ext-spl": "*",
- "php": ">=5.3.3",
- "phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "~2.1",
- "phpunit/php-file-iterator": "~1.4",
- "phpunit/php-text-template": "~1.2",
- "phpunit/php-timer": ">=1.0.6",
- "phpunit/phpunit-mock-objects": "~2.3",
- "sebastian/comparator": "~1.1",
- "sebastian/diff": "~1.2",
- "sebastian/environment": "~1.3",
- "sebastian/exporter": "~1.2",
- "sebastian/global-state": "~1.0",
- "sebastian/version": "~1.0",
- "symfony/yaml": "~2.1|~3.0"
+ "php": ">=5.3.9",
+ "symfony/dom-crawler": "~2.0,>=2.0.5"
+ },
+ "require-dev": {
+ "symfony/css-selector": "~2.0,>=2.0.5",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.0,>=2.0.5"
},
"suggest": {
- "phpunit/php-invoker": "~1.1"
+ "symfony/process": ""
},
- "time": "2015-10-01 09:14:30",
- "bin": [
- "phpunit"
- ],
+ "time": "2015-09-06 08:36:38",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.8.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "Symfony\\Component\\BrowserKit\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "The PHP Unit Testing framework.",
- "homepage": "https://phpunit.de/",
- "keywords": [
- "phpunit",
- "testing",
- "xunit"
- ]
+ "description": "Symfony BrowserKit Component",
+ "homepage": "https://symfony.com"
}
]
diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php
index c816f015b370c6fcb287587a841c6e36f985a2d4..ae32282928ed0e58fd5afaa0332e987ea73f7580 100644
--- a/vendor/symfony/console/Application.php
+++ b/vendor/symfony/console/Application.php
@@ -885,13 +885,15 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
try {
$exitCode = $command->run($input, $output);
} catch (\Exception $e) {
+ $event = new ConsoleExceptionEvent($command, $input, $output, $e, $e->getCode());
+ $this->dispatcher->dispatch(ConsoleEvents::EXCEPTION, $event);
+
+ $e = $event->getException();
+
$event = new ConsoleTerminateEvent($command, $input, $output, $e->getCode());
$this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
- $event = new ConsoleExceptionEvent($command, $input, $output, $e, $event->getExitCode());
- $this->dispatcher->dispatch(ConsoleEvents::EXCEPTION, $event);
-
- throw $event->getException();
+ throw $e;
}
} else {
$exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
diff --git a/vendor/symfony/console/Helper/DialogHelper.php b/vendor/symfony/console/Helper/DialogHelper.php
index a280b49c19833b83017aa76a6f6be9299130adc1..dbadac2cbfb3ec1c648d41861763b3e0a0ea81e2 100644
--- a/vendor/symfony/console/Helper/DialogHelper.php
+++ b/vendor/symfony/console/Helper/DialogHelper.php
@@ -399,7 +399,7 @@ public function setInputStream($stream)
/**
* Returns the helper's input stream.
*
- * @return string
+ * @return resource|null The input stream or null if the default STDIN is used
*/
public function getInputStream()
{
diff --git a/vendor/symfony/console/Helper/ProcessHelper.php b/vendor/symfony/console/Helper/ProcessHelper.php
index 0c9da73947623794443ed1134cda49bac3f6937a..a811eb48e6798f81feff2f0705eff6d6b4ae15bf 100644
--- a/vendor/symfony/console/Helper/ProcessHelper.php
+++ b/vendor/symfony/console/Helper/ProcessHelper.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Console\Helper;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process;
@@ -37,6 +38,10 @@ class ProcessHelper extends Helper
*/
public function run(OutputInterface $output, $cmd, $error = null, $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)
{
+ if ($output instanceof ConsoleOutputInterface) {
+ $output = $output->getErrorOutput();
+ }
+
$formatter = $this->getHelperSet()->get('debug_formatter');
if (is_array($cmd)) {
@@ -109,6 +114,10 @@ public function mustRun(OutputInterface $output, $cmd, $error = null, $callback
*/
public function wrapCallback(OutputInterface $output, Process $process, $callback = null)
{
+ if ($output instanceof ConsoleOutputInterface) {
+ $output = $output->getErrorOutput();
+ }
+
$formatter = $this->getHelperSet()->get('debug_formatter');
$that = $this;
diff --git a/vendor/symfony/console/Helper/ProgressBar.php b/vendor/symfony/console/Helper/ProgressBar.php
index e5ba92773889d21c108514583c7c5b6d62b37f1b..7f4b2efb8d5ae348c498e302f9b5cff059654248 100644
--- a/vendor/symfony/console/Helper/ProgressBar.php
+++ b/vendor/symfony/console/Helper/ProgressBar.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Console\Helper;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface;
/**
@@ -54,6 +55,10 @@ class ProgressBar
*/
public function __construct(OutputInterface $output, $max = 0)
{
+ if ($output instanceof ConsoleOutputInterface) {
+ $output = $output->getErrorOutput();
+ }
+
$this->output = $output;
$this->setMaxSteps($max);
@@ -476,7 +481,7 @@ public function clear()
/**
* Sets the progress bar maximal steps.
*
- * @param int The progress bar max steps
+ * @param int $max The progress bar max steps
*/
private function setMaxSteps($max)
{
diff --git a/vendor/symfony/console/Helper/QuestionHelper.php b/vendor/symfony/console/Helper/QuestionHelper.php
index 6584377aad015633ff28c7673f38e9ad82f03ca4..a533f8728df3ee007cfa2f1b58a5502b271357d6 100644
--- a/vendor/symfony/console/Helper/QuestionHelper.php
+++ b/vendor/symfony/console/Helper/QuestionHelper.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Console\Helper;
use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Console\Question\Question;
@@ -41,6 +42,10 @@ class QuestionHelper extends Helper
*/
public function ask(InputInterface $input, OutputInterface $output, Question $question)
{
+ if ($output instanceof ConsoleOutputInterface) {
+ $output = $output->getErrorOutput();
+ }
+
if (!$input->isInteractive()) {
return $question->getDefault();
}
diff --git a/vendor/symfony/console/Helper/Table.php b/vendor/symfony/console/Helper/Table.php
index 6da4b7d7a1c30b7dc6b46d02d69634396a488e81..6f5fbd047cee707038a82c0b31fa0cd16ee6e711 100644
--- a/vendor/symfony/console/Helper/Table.php
+++ b/vendor/symfony/console/Helper/Table.php
@@ -376,7 +376,7 @@ private function buildTableRows($rows)
* fill rows that contains rowspan > 1.
*
* @param array $rows
- * @param array $line
+ * @param int $line
*
* @return array
*/
@@ -429,7 +429,7 @@ private function fillNextRows($rows, $line)
* fill cells for a row that contains colspan > 1.
*
* @param array $row
- * @param array $column
+ * @param int $column
*
* @return array
*/
diff --git a/vendor/symfony/console/Output/ConsoleOutput.php b/vendor/symfony/console/Output/ConsoleOutput.php
index 50ef4df9004ce91d5318b9e1647983e3aa15bd3e..04bd51b782aff2455c38ac3320eeaa61cb9b73aa 100644
--- a/vendor/symfony/console/Output/ConsoleOutput.php
+++ b/vendor/symfony/console/Output/ConsoleOutput.php
@@ -48,7 +48,12 @@ public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = nu
{
parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
+ $actualDecorated = $this->isDecorated();
$this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated, $this->getFormatter());
+
+ if (null === $decorated) {
+ $this->setDecorated($actualDecorated && $this->stderr->isDecorated());
+ }
}
/**
diff --git a/vendor/symfony/console/Output/OutputInterface.php b/vendor/symfony/console/Output/OutputInterface.php
index f7f30636feb090d222c69f054a37bff6356c3c28..edffb9ca8eac19519ac72d05814dcb4231fdc42f 100644
--- a/vendor/symfony/console/Output/OutputInterface.php
+++ b/vendor/symfony/console/Output/OutputInterface.php
@@ -48,7 +48,7 @@ public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL);
/**
* Writes a message to the output and adds a newline at the end.
*
- * @param string|array $messages The message as an array of lines of a single string
+ * @param string|array $messages The message as an array of lines or a single string
* @param int $type The type of output (one of the OUTPUT constants)
*
* @throws \InvalidArgumentException When unknown output type is given
diff --git a/vendor/symfony/console/Output/StreamOutput.php b/vendor/symfony/console/Output/StreamOutput.php
index 494cded85ed1306b64016c0ac11f9774a6342204..ecf0bb8c1eaa8c4b87d0ad02ddb22bb92a1f7176 100644
--- a/vendor/symfony/console/Output/StreamOutput.php
+++ b/vendor/symfony/console/Output/StreamOutput.php
@@ -35,7 +35,7 @@ class StreamOutput extends Output
/**
* Constructor.
*
- * @param mixed $stream A stream resource
+ * @param resource $stream A stream resource
* @param int $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
* @param bool|null $decorated Whether to decorate messages (null for auto-guessing)
* @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
diff --git a/vendor/symfony/console/Tests/ApplicationTest.php b/vendor/symfony/console/Tests/ApplicationTest.php
index 45242cf1cfb4b06bf48b04f6d9ee2e1ae777766c..d33e5848bdac1f8b475f77336010d737dc89e934 100644
--- a/vendor/symfony/console/Tests/ApplicationTest.php
+++ b/vendor/symfony/console/Tests/ApplicationTest.php
@@ -884,7 +884,7 @@ public function testRunWithDispatcher()
$tester = new ApplicationTester($application);
$tester->run(array('command' => 'foo'));
- $this->assertEquals('before.foo.after.', $tester->getDisplay());
+ $this->assertEquals('before.foo.after.'.PHP_EOL, $tester->getDisplay());
}
/**
@@ -920,7 +920,7 @@ public function testRunDispatchesAllEventsWithException()
$tester = new ApplicationTester($application);
$tester->run(array('command' => 'foo'));
- $this->assertContains('before.foo.after.caught.', $tester->getDisplay());
+ $this->assertContains('before.foo.caught.after.', $tester->getDisplay());
}
public function testRunWithDispatcherSkippingCommand()
@@ -965,14 +965,14 @@ protected function getDispatcher($skipCommand = false)
}
});
$dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use ($skipCommand) {
- $event->getOutput()->write('after.');
+ $event->getOutput()->writeln('after.');
if (!$skipCommand) {
$event->setExitCode(113);
}
});
$dispatcher->addListener('console.exception', function (ConsoleExceptionEvent $event) {
- $event->getOutput()->writeln('caught.');
+ $event->getOutput()->write('caught.');
$event->setException(new \LogicException('caught.', $event->getExitCode(), $event->getException()));
});
diff --git a/vendor/symfony/console/Tests/ClockMock.php b/vendor/symfony/console/Tests/ClockMock.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e9231662e37efe6e484702ca13f5a16b41510d0
--- /dev/null
+++ b/vendor/symfony/console/Tests/ClockMock.php
@@ -0,0 +1,41 @@
+<?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\Console\Helper;
+
+use Symfony\Component\Console\Tests;
+
+function time()
+{
+ return Tests\time();
+}
+
+namespace Symfony\Component\Console\Tests;
+
+function with_clock_mock($enable = null)
+{
+ static $enabled;
+
+ if (null === $enable) {
+ return $enabled;
+ }
+
+ $enabled = $enable;
+}
+
+function time()
+{
+ if (!with_clock_mock()) {
+ return \time();
+ }
+
+ return $_SERVER['REQUEST_TIME'];
+}
diff --git a/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt b/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
index 4c7f55024587a4a55d5e7562e7f2e42ea1299c0f..8277d9e66b587d3671d42ab998d9db037d7c277b 100644
--- a/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
+++ b/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
@@ -2,11 +2,11 @@
<symfony>
<commands>
<command id="help" name="help">
- <usages>
- <usage>help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]</usage>
- </usages>
- <description>Displays help for a command</description>
- <help>The <info>help</info> command displays help for a given command:
+ <usages>
+ <usage>help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]</usage>
+ </usages>
+ <description>Displays help for a command</description>
+ <help>The <info>help</info> command displays help for a given command:
<info>php app/console help list</info>
@@ -15,56 +15,56 @@
<info>php app/console help --format=xml list</info>
To display the list of available commands, please use the <info>list</info> command.</help>
- <arguments>
- <argument name="command_name" is_required="0" is_array="0">
- <description>The command name</description>
- <defaults>
- <default>help</default>
- </defaults>
- </argument>
- </arguments>
- <options>
- <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>To output help as XML</description>
- </option>
- <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>The output format (txt, xml, json, or md)</description>
- <defaults>
- <default>txt</default>
- </defaults>
- </option>
- <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>To output raw command help</description>
- </option>
- <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Display this help message</description>
- </option>
- <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Do not output any message</description>
- </option>
- <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
- </option>
- <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Display this application version</description>
- </option>
- <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Force ANSI output</description>
- </option>
- <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Disable ANSI output</description>
- </option>
- <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Do not ask any interactive question</description>
- </option>
- </options>
-</command>
+ <arguments>
+ <argument name="command_name" is_required="0" is_array="0">
+ <description>The command name</description>
+ <defaults>
+ <default>help</default>
+ </defaults>
+ </argument>
+ </arguments>
+ <options>
+ <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>To output help as XML</description>
+ </option>
+ <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+ <description>The output format (txt, xml, json, or md)</description>
+ <defaults>
+ <default>txt</default>
+ </defaults>
+ </option>
+ <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>To output raw command help</description>
+ </option>
+ <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Display this help message</description>
+ </option>
+ <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Do not output any message</description>
+ </option>
+ <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+ </option>
+ <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Display this application version</description>
+ </option>
+ <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Force ANSI output</description>
+ </option>
+ <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Disable ANSI output</description>
+ </option>
+ <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Do not ask any interactive question</description>
+ </option>
+ </options>
+ </command>
<command id="list" name="list">
- <usages>
- <usage>list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]</usage>
- </usages>
- <description>Lists commands</description>
- <help>The <info>list</info> command lists all commands:
+ <usages>
+ <usage>list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]</usage>
+ </usages>
+ <description>Lists commands</description>
+ <help>The <info>list</info> command lists all commands:
<info>php app/console list</info>
@@ -79,59 +79,59 @@
It's also possible to get raw list of commands (useful for embedding command runner):
<info>php app/console list --raw</info></help>
- <arguments>
- <argument name="namespace" is_required="0" is_array="0">
- <description>The namespace name</description>
- <defaults/>
- </argument>
- </arguments>
- <options>
- <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>To output list as XML</description>
- </option>
- <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>To output raw command list</description>
- </option>
- <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>The output format (txt, xml, json, or md)</description>
- <defaults>
- <default>txt</default>
- </defaults>
- </option>
- </options>
-</command>
+ <arguments>
+ <argument name="namespace" is_required="0" is_array="0">
+ <description>The namespace name</description>
+ <defaults/>
+ </argument>
+ </arguments>
+ <options>
+ <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>To output list as XML</description>
+ </option>
+ <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>To output raw command list</description>
+ </option>
+ <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+ <description>The output format (txt, xml, json, or md)</description>
+ <defaults>
+ <default>txt</default>
+ </defaults>
+ </option>
+ </options>
+ </command>
<command id="foo:bar" name="foo:bar">
- <usages>
- <usage>foo:bar</usage>
- <usage>afoobar</usage>
- </usages>
- <description>The foo:bar command</description>
- <help>The foo:bar command</help>
- <arguments/>
- <options>
- <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Display this help message</description>
- </option>
- <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Do not output any message</description>
- </option>
- <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
- </option>
- <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Display this application version</description>
- </option>
- <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Force ANSI output</description>
- </option>
- <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Disable ANSI output</description>
- </option>
- <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Do not ask any interactive question</description>
- </option>
- </options>
-</command>
+ <usages>
+ <usage>foo:bar</usage>
+ <usage>afoobar</usage>
+ </usages>
+ <description>The foo:bar command</description>
+ <help>The foo:bar command</help>
+ <arguments/>
+ <options>
+ <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Display this help message</description>
+ </option>
+ <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Do not output any message</description>
+ </option>
+ <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+ </option>
+ <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Display this application version</description>
+ </option>
+ <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Force ANSI output</description>
+ </option>
+ <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Disable ANSI output</description>
+ </option>
+ <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Do not ask any interactive question</description>
+ </option>
+ </options>
+ </command>
</commands>
<namespaces>
<namespace id="_global">
diff --git a/vendor/symfony/console/Tests/Fixtures/application_asxml2.txt b/vendor/symfony/console/Tests/Fixtures/application_asxml2.txt
index 89d13108b7d1b8d9072c9fe831bbded252932e79..93d6d4e9966b63fb5f4fcf66f40441ae18e57cbc 100644
--- a/vendor/symfony/console/Tests/Fixtures/application_asxml2.txt
+++ b/vendor/symfony/console/Tests/Fixtures/application_asxml2.txt
@@ -2,36 +2,36 @@
<symfony>
<commands namespace="foo">
<command id="foo:bar" name="foo:bar">
- <usages>
- <usage>foo:bar</usage>
- <usage>afoobar</usage>
- </usages>
- <description>The foo:bar command</description>
- <help>The foo:bar command</help>
- <arguments/>
- <options>
- <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Display this help message</description>
- </option>
- <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Do not output any message</description>
- </option>
- <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
- </option>
- <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Display this application version</description>
- </option>
- <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Force ANSI output</description>
- </option>
- <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Disable ANSI output</description>
- </option>
- <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
- <description>Do not ask any interactive question</description>
- </option>
- </options>
-</command>
+ <usages>
+ <usage>foo:bar</usage>
+ <usage>afoobar</usage>
+ </usages>
+ <description>The foo:bar command</description>
+ <help>The foo:bar command</help>
+ <arguments/>
+ <options>
+ <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Display this help message</description>
+ </option>
+ <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Do not output any message</description>
+ </option>
+ <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+ </option>
+ <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Display this application version</description>
+ </option>
+ <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Force ANSI output</description>
+ </option>
+ <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Disable ANSI output</description>
+ </option>
+ <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+ <description>Do not ask any interactive question</description>
+ </option>
+ </options>
+ </command>
</commands>
</symfony>
diff --git a/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php b/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php
index 7b9cf29f0d356f5bc942240809e5232bacc4d388..e0272463ea7114b7d01426ebc9823c6b26a07bc5 100644
--- a/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php
+++ b/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php
@@ -13,12 +13,25 @@
use Symfony\Component\Console\Helper\ProgressHelper;
use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Tests;
+
+require_once __DIR__.'/../ClockMock.php';
/**
* @group legacy
*/
class LegacyProgressHelperTest extends \PHPUnit_Framework_TestCase
{
+ protected function setUp()
+ {
+ Tests\with_clock_mock(true);
+ }
+
+ protected function tearDown()
+ {
+ Tests\with_clock_mock(false);
+ }
+
public function testAdvance()
{
$progress = new ProgressHelper();
diff --git a/vendor/symfony/console/Tests/Helper/ProgressBarTest.php b/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
index 51962f3d16c64bae075238411f073da9abadba4a..e37853e40ce613eb6cb607d6aeb2ddfd24151b7f 100644
--- a/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
+++ b/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
@@ -14,9 +14,20 @@
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Helper\Helper;
use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Tests;
class ProgressBarTest extends \PHPUnit_Framework_TestCase
{
+ protected function setUp()
+ {
+ Tests\with_clock_mock(true);
+ }
+
+ protected function tearDown()
+ {
+ Tests\with_clock_mock(false);
+ }
+
public function testMultipleStart()
{
$bar = new ProgressBar($output = $this->getOutputStream());
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php
index 142bd163153fa1bab649f524fac223d7f449c5ed..83f8d13d9ccf22075df0e985487eab2bd51cb165 100644
--- a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php
+++ b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php
@@ -33,15 +33,14 @@ public function parse($source)
{
// Matches an optional namespace, optional element, and required class
// $source = 'test|input.ab6bd_field';
- // $matches = array (size=5)
- // 0 => string 'test:input.ab6bd_field' (length=22)
- // 1 => string 'test:' (length=5)
- // 2 => string 'test' (length=4)
- // 3 => string 'input' (length=5)
- // 4 => string 'ab6bd_field' (length=11)
- if (preg_match('/^(([a-z]+)\|)?([\w-]+|\*)?\.([\w-]+)$/i', trim($source), $matches)) {
+ // $matches = array (size=4)
+ // 0 => string 'test|input.ab6bd_field' (length=22)
+ // 1 => string 'test' (length=4)
+ // 2 => string 'input' (length=5)
+ // 3 => string 'ab6bd_field' (length=11)
+ if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+\.([\w-]++)$/i', trim($source), $matches)) {
return array(
- new SelectorNode(new ClassNode(new ElementNode($matches[2] ?: null, $matches[3] ?: null), $matches[4])),
+ new SelectorNode(new ClassNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
);
}
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php
index f62d25960cc64ac0fd3c771dacf84ea58893b60e..00e443553b4858eb008db8e53d86539f3fd435ea 100644
--- a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php
+++ b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php
@@ -32,13 +32,12 @@ public function parse($source)
{
// Matches an optional namespace, required element or `*`
// $source = 'testns|testel';
- // $matches = array (size=4)
- // 0 => string 'testns:testel' (length=13)
- // 1 => string 'testns:' (length=7)
- // 2 => string 'testns' (length=6)
- // 3 => string 'testel' (length=6)
- if (preg_match('/^(([a-z]+)\|)?([\w-]+|\*)$/i', trim($source), $matches)) {
- return array(new SelectorNode(new ElementNode($matches[2] ?: null, $matches[3])));
+ // $matches = array (size=3)
+ // 0 => string 'testns|testel' (length=13)
+ // 1 => string 'testns' (length=6)
+ // 2 => string 'testel' (length=6)
+ if (preg_match('/^(?:([a-z]++)\|)?([\w-]++|\*)$/i', trim($source), $matches)) {
+ return array(new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2])));
}
return array();
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php
index fde614149b71f959fadd7d9e1768811115000c02..3dbad79d5b471c8da42716529914f3bdceea2501 100644
--- a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php
+++ b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php
@@ -33,15 +33,14 @@ public function parse($source)
{
// Matches an optional namespace, optional element, and required id
// $source = 'test|input#ab6bd_field';
- // $matches = array (size=5)
- // 0 => string 'test:input#ab6bd_field' (length=22)
- // 1 => string 'test:' (length=5)
- // 2 => string 'test' (length=4)
- // 3 => string 'input' (length=5)
- // 4 => string 'ab6bd_field' (length=11)
- if (preg_match('/^(([a-z]+)\|)?([\w-]+|\*)?#([\w-]+)$/i', trim($source), $matches)) {
+ // $matches = array (size=4)
+ // 0 => string 'test|input#ab6bd_field' (length=22)
+ // 1 => string 'test' (length=4)
+ // 2 => string 'input' (length=5)
+ // 3 => string 'ab6bd_field' (length=11)
+ if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w-]++)$/i', trim($source), $matches)) {
return array(
- new SelectorNode(new HashNode(new ElementNode($matches[2] ?: null, $matches[3] ?: null), $matches[4])),
+ new SelectorNode(new HashNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
);
}
diff --git a/vendor/symfony/css-selector/XPath/TranslatorInterface.php b/vendor/symfony/css-selector/XPath/TranslatorInterface.php
index 1d9d1c88ee4efcfd8a5cc266e0c8ba3944d2df9d..bc19ae86346c4d4d24ff581f966ccb1642a40097 100644
--- a/vendor/symfony/css-selector/XPath/TranslatorInterface.php
+++ b/vendor/symfony/css-selector/XPath/TranslatorInterface.php
@@ -29,7 +29,7 @@ interface TranslatorInterface
* @param string $cssExpr
* @param string $prefix
*
- * @return XPathExpr
+ * @return string
*/
public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
@@ -39,7 +39,7 @@ public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
* @param SelectorNode $selector
* @param string $prefix
*
- * @return XPathExpr
+ * @return string
*/
public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::');
}
diff --git a/vendor/symfony/debug/DebugClassLoader.php b/vendor/symfony/debug/DebugClassLoader.php
index c8e5d1a83ff4de01560edf01a5016ba3e1e7ecbc..37d15d1862a6d7b998947044cbd1ffe1c7ab97ae 100644
--- a/vendor/symfony/debug/DebugClassLoader.php
+++ b/vendor/symfony/debug/DebugClassLoader.php
@@ -221,8 +221,22 @@ public function loadClass($class)
throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
}
- if (self::$caseCheck && preg_match('#(?:[/\\\\][a-zA-Z_\x7F-\xFF][a-zA-Z0-9_\x7F-\xFF]*+)++\.(?:php|hh)$#D', $file, $tail)) {
- $tail = $tail[0];
+ if (self::$caseCheck) {
+ $real = explode('\\', $class.strrchr($file, '.'));
+ $tail = explode(DIRECTORY_SEPARATOR, str_replace('/', DIRECTORY_SEPARATOR, $file));
+
+ $i = count($tail) - 1;
+ $j = count($real) - 1;
+
+ while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
+ --$i;
+ --$j;
+ }
+
+ array_splice($tail, 0, $i + 1);
+ }
+ if (self::$caseCheck && $tail) {
+ $tail = DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $tail);
$tailLen = strlen($tail);
$real = $refl->getFileName();
@@ -289,7 +303,7 @@ public function loadClass($class)
if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
&& 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
) {
- throw new \RuntimeException(sprintf('Case mismatch between class and source file names: %s vs %s', $class, $real));
+ throw new \RuntimeException(sprintf('Case mismatch between class and real file names: %s vs %s in %s', substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)));
}
}
diff --git a/vendor/symfony/debug/ExceptionHandler.php b/vendor/symfony/debug/ExceptionHandler.php
index c2b197138ea16e9c82ab88e80fa1515aed67ccfc..027b66c0521709fa29aedda67b7e9ab17b939344 100644
--- a/vendor/symfony/debug/ExceptionHandler.php
+++ b/vendor/symfony/debug/ExceptionHandler.php
@@ -223,7 +223,7 @@ public function getContent(FlattenException $exception)
{
switch ($exception->getStatusCode()) {
case 404:
- $title = 'The page you are looking for could not be found.';
+ $title = 'Sorry, the page you are looking for could not be found.';
break;
default:
$title = 'Whoops, looks like something went wrong.';
diff --git a/vendor/symfony/debug/Tests/DebugClassLoaderTest.php b/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
index a368a7d25704a72e7bfb0c4e0363d6c4e3081078..1516dbedf9a00cf5784196710b754d31f666f5d8 100644
--- a/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
+++ b/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -136,7 +136,7 @@ class_exists(__NAMESPACE__.'\TestingCaseMismatch', true);
/**
* @expectedException \RuntimeException
- * @expectedExceptionMessage Case mismatch between class and source file names
+ * @expectedExceptionMessage Case mismatch between class and real file names
*/
public function testFileCaseMismatch()
{
diff --git a/vendor/symfony/dependency-injection/Compiler/ExtensionCompilerPass.php b/vendor/symfony/dependency-injection/Compiler/ExtensionCompilerPass.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9b418d497bedab7dc405b61e65345ba9668e44c
--- /dev/null
+++ b/vendor/symfony/dependency-injection/Compiler/ExtensionCompilerPass.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * A pass to automatically process extensions if they implement
+ * CompilerPassInterface.
+ *
+ * @author Wouter J <wouter@wouterj.nl>
+ */
+class ExtensionCompilerPass implements CompilerPassInterface
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function process(ContainerBuilder $container)
+ {
+ foreach ($container->getExtensions() as $extension) {
+ if (!$extension instanceof CompilerPassInterface) {
+ continue;
+ }
+
+ $extension->process($container);
+ }
+ }
+}
diff --git a/vendor/symfony/dependency-injection/Compiler/PassConfig.php b/vendor/symfony/dependency-injection/Compiler/PassConfig.php
index 044529eb6d7c0359713a3eb77a2a701a3d960612..d6dee26fda766169bea7a355dc540865cd436057 100644
--- a/vendor/symfony/dependency-injection/Compiler/PassConfig.php
+++ b/vendor/symfony/dependency-injection/Compiler/PassConfig.php
@@ -45,6 +45,7 @@ public function __construct()
$this->mergePass = new MergeExtensionConfigurationPass();
$this->optimizationPasses = array(
+ new ExtensionCompilerPass(),
new ResolveDefinitionTemplatesPass(),
new DecoratorServicePass(),
new ResolveParameterPlaceHoldersPass(),
diff --git a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
index be2d3f130081f6b7352504803cef2d88630ea6bd..5b3fb464b62a70d9af2ec2ba99d8951bf43df0d4 100644
--- a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -19,6 +19,7 @@
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Yaml\Exception\ParseException;
use Symfony\Component\Yaml\Parser as YamlParser;
use Symfony\Component\ExpressionLanguage\Expression;
@@ -316,7 +317,13 @@ protected function loadFile($file)
$this->yamlParser = new YamlParser();
}
- return $this->validate($this->yamlParser->parse(file_get_contents($file)), $file);
+ try {
+ $configuration = $this->yamlParser->parse(file_get_contents($file));
+ } catch (ParseException $e) {
+ throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
+ }
+
+ return $this->validate($configuration, $file);
}
/**
diff --git a/vendor/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php b/vendor/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ef690da16329eb5af59e4c0566f17293f4e15bb7
--- /dev/null
+++ b/vendor/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
+
+/**
+ * @author Wouter J <wouter@wouterj.nl>
+ */
+class ExtensionCompilerPassTest extends \PHPUnit_Framework_TestCase
+{
+ private $container;
+ private $pass;
+
+ public function setUp()
+ {
+ $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+ $this->pass = new ExtensionCompilerPass();
+ }
+
+ public function testProcess()
+ {
+ $extension1 = $this->createExtensionMock(true);
+ $extension1->expects($this->once())->method('process');
+ $extension2 = $this->createExtensionMock(false);
+ $extension3 = $this->createExtensionMock(false);
+ $extension4 = $this->createExtensionMock(true);
+ $extension4->expects($this->once())->method('process');
+
+ $this->container->expects($this->any())
+ ->method('getExtensions')
+ ->will($this->returnValue(array($extension1, $extension2, $extension3, $extension4)))
+ ;
+
+ $this->pass->process($this->container);
+ }
+
+ private function createExtensionMock($hasInlineCompile)
+ {
+ return $this->getMock('Symfony\Component\DependencyInjection\\'.(
+ $hasInlineCompile
+ ? 'Compiler\CompilerPassInterface'
+ : 'Extension\ExtensionInterface'
+ ));
+ }
+}
diff --git a/vendor/symfony/dependency-injection/Tests/ContainerTest.php b/vendor/symfony/dependency-injection/Tests/ContainerTest.php
index dd8358e929962ed42706e60b5c599caf31474e72..472bd1ff62bcd144c247c979fafabe3b8c05872f 100644
--- a/vendor/symfony/dependency-injection/Tests/ContainerTest.php
+++ b/vendor/symfony/dependency-injection/Tests/ContainerTest.php
@@ -539,7 +539,7 @@ public function testHasScope()
}
/**
- * @expectedException Exception
+ * @expectedException \Exception
* @expectedExceptionMessage Something went terribly wrong!
*/
public function testGetThrowsException()
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
new file mode 100644
index 0000000000000000000000000000000000000000..040e136a342520de248a1e0ae9006bd67a732b1b
--- /dev/null
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
@@ -0,0 +1,32 @@
+<?php Phar::mapPhar("ProjectWithXsdExtensionInPhar.phar"); require_once "phar://ProjectWithXsdExtensionInPhar.phar/ProjectWithXsdExtensionInPhar.php"; __HALT_COMPILER(); ?>
+£����������"���ProjectWithXsdExtensionInPhar.phar����!���ProjectWithXsdExtensionInPhar.phpl���T’Ul��ÆWѶ���������schema/project-1.0.xsd¬���T’U¬��rr‰ö¶������<?php
+
+class ProjectWithXsdExtensionInPhar extends ProjectExtension
+{
+ public function getXsdValidationBasePath()
+ {
+ return __DIR__.'/schema';
+ }
+
+ public function getNamespace()
+ {
+ return 'http://www.example.com/schema/projectwithxsdinphar';
+ }
+
+ public function getAlias()
+ {
+ return 'projectwithxsdinphar';
+ }
+}<?xml version="1.0" encoding="UTF-8" ?>
+
+<xsd:schema xmlns="http://www.example.com/schema/projectwithxsdinphar"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.example.com/schema/projectwithxsdinphar"
+ elementFormDefault="qualified">
+
+ <xsd:element name="bar" type="bar" />
+
+ <xsd:complexType name="bar">
+ <xsd:attribute name="foo" type="xsd:string" />
+ </xsd:complexType>
+</xsd:schema>ÿ|ÔÓÚM*cý (ã.ˆk&`Œ���GBMB
\ No newline at end of file
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1f58cac6acdb071762218237bdac59c7659db7da
--- /dev/null
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml
@@ -0,0 +1,2 @@
+parameters:
+ FOO: bar
diff --git a/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
index 28cf0ebf6252afc6524392222c8f220296ff6e9f..c94f40bf5bdb122c47317807bd5d79a36eee201c 100644
--- a/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
@@ -88,6 +88,7 @@ public function provideInvalidFiles()
array('bad_services'),
array('bad_service'),
array('bad_calls'),
+ array('bad_format'),
);
}
diff --git a/vendor/symfony/dom-crawler/Crawler.php b/vendor/symfony/dom-crawler/Crawler.php
index 0ab6b98221a85ce52bf515a5dae98e1680a2059b..aa39d7ccfd9240064033ca54ea6f64a077903a4f 100644
--- a/vendor/symfony/dom-crawler/Crawler.php
+++ b/vendor/symfony/dom-crawler/Crawler.php
@@ -790,7 +790,7 @@ public function form(array $values = null, $method = null)
throw new \InvalidArgumentException('The current node list is empty.');
}
- $form = new Form($this->getNode(0), $this->uri, $method);
+ $form = new Form($this->getNode(0), $this->uri, $method, $this->baseHref);
if (null !== $values) {
$form->setValues($values);
@@ -1036,13 +1036,13 @@ private function discoverNamespace(\DOMXPath $domxpath, $prefix)
}
/**
- * @param $xpath
+ * @param string $xpath
*
* @return array
*/
private function findNamespacePrefixes($xpath)
{
- if (preg_match_all('/(?P<prefix>[a-z_][a-z_0-9\-\.]*):[^"\/:]/i', $xpath, $matches)) {
+ if (preg_match_all('/(?P<prefix>[a-z_][a-z_0-9\-\.]*+):[^"\/:]/i', $xpath, $matches)) {
return array_unique($matches['prefix']);
}
diff --git a/vendor/symfony/dom-crawler/Form.php b/vendor/symfony/dom-crawler/Form.php
index bf7ce5d55463dde171d6df6733292ecc0f515fc5..d95fb07ffc61128397c9737e5b155cb24aa4b191 100644
--- a/vendor/symfony/dom-crawler/Form.php
+++ b/vendor/symfony/dom-crawler/Form.php
@@ -33,20 +33,27 @@ class Form extends Link implements \ArrayAccess
*/
private $fields;
+ /**
+ * @var string
+ */
+ private $baseHref;
+
/**
* Constructor.
*
* @param \DOMElement $node A \DOMElement instance
* @param string $currentUri The URI of the page where the form is embedded
* @param string $method The method to use for the link (if null, it defaults to the method defined by the form)
+ * @param string $baseHref The URI of the <base> used for relative links, but not for empty action
*
* @throws \LogicException if the node is not a button inside a form tag
*
* @api
*/
- public function __construct(\DOMElement $node, $currentUri, $method = null)
+ public function __construct(\DOMElement $node, $currentUri, $method = null, $baseHref = null)
{
parent::__construct($node, $currentUri, $method);
+ $this->baseHref = $baseHref;
$this->initialize();
}
@@ -458,6 +465,10 @@ private function initialize()
$this->addField($node);
}
}
+
+ if ($this->baseHref && '' !== $this->node->getAttribute('action')) {
+ $this->currentUri = $this->baseHref;
+ }
}
private function addField(\DOMElement $node)
diff --git a/vendor/symfony/dom-crawler/Tests/CrawlerTest.php b/vendor/symfony/dom-crawler/Tests/CrawlerTest.php
index 9560d069998f59d251193627b5aa7cc183093405..4cfd06f5c5f1139d3f64c797c504a9d8557a5944 100755
--- a/vendor/symfony/dom-crawler/Tests/CrawlerTest.php
+++ b/vendor/symfony/dom-crawler/Tests/CrawlerTest.php
@@ -982,9 +982,12 @@ public function testBaseTagWithForm($baseValue, $actionValue, $expectedUri, $cur
public function getBaseTagWithFormData()
{
return array(
+ array('https://base.com/', 'link/', 'https://base.com/link/', 'https://base.com/link/', '<base> tag does work with a path and relative form action'),
array('/basepath', '/registration', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and form action'),
array('/basepath', '', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and empty form action'),
+ array('http://base.com/', '/registration', 'http://base.com/registration', 'http://domain.com/registration', '<base> tag does work with a URL and form action'),
array('http://base.com', '', 'http://domain.com/path/form', 'http://domain.com/path/form', '<base> tag does work with a URL and an empty form action'),
+ array('http://base.com/path', '/registration', 'http://base.com/registration', 'http://domain.com/path/form', '<base> tag does work with a URL and form action'),
);
}
diff --git a/vendor/symfony/dom-crawler/Tests/FormTest.php b/vendor/symfony/dom-crawler/Tests/FormTest.php
index 59c3c76cf0f4e149a2327ab19ca95ba9ca5ea4a7..5bfbfb98245dc8426097fc2c5750ff5a01387447 100644
--- a/vendor/symfony/dom-crawler/Tests/FormTest.php
+++ b/vendor/symfony/dom-crawler/Tests/FormTest.php
@@ -820,7 +820,7 @@ public function testFormRegistrySetValueOnCompoundField()
}
/**
- * @expectedException InvalidArgumentException
+ * @expectedException \InvalidArgumentException
* @expectedExceptionMessage Unreachable field "0"
*/
public function testFormRegistrySetArrayOnNotCompoundField()
diff --git a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
index 76f0e387762a38da24688e2831ea6f450b837d97..b92defe69125769e2095a0bacfd1b29e8b3fe19c 100644
--- a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
@@ -100,7 +100,7 @@ public function removeListener($eventName, $listener)
}
/**
- * @see EventDispatcherInterface::hasListeners()
+ * {@inheritdoc}
*/
public function hasListeners($eventName = null)
{
@@ -116,7 +116,7 @@ public function hasListeners($eventName = null)
}
/**
- * @see EventDispatcherInterface::getListeners()
+ * {@inheritdoc}
*/
public function getListeners($eventName = null)
{
@@ -152,21 +152,6 @@ public function addSubscriberService($serviceId, $class)
}
}
- /**
- * {@inheritdoc}
- *
- * Lazily loads listeners for this event from the dependency injection
- * container.
- *
- * @throws \InvalidArgumentException if the service is not defined
- */
- public function dispatch($eventName, Event $event = null)
- {
- $this->lazyLoad($eventName);
-
- return parent::dispatch($eventName, $event);
- }
-
public function getContainer()
{
return $this->container;
diff --git a/vendor/symfony/event-dispatcher/EventDispatcher.php b/vendor/symfony/event-dispatcher/EventDispatcher.php
index 46c11100b34167cec63da4ff5a21b4f135ae94aa..dc1b3da4c7a5cc7a5e72c070b614d86346c3de34 100644
--- a/vendor/symfony/event-dispatcher/EventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/EventDispatcher.php
@@ -33,9 +33,7 @@ class EventDispatcher implements EventDispatcherInterface
private $sorted = array();
/**
- * @see EventDispatcherInterface::dispatch()
- *
- * @api
+ * {@inheritdoc}
*/
public function dispatch($eventName, Event $event = null)
{
@@ -46,21 +44,23 @@ public function dispatch($eventName, Event $event = null)
$event->setDispatcher($this);
$event->setName($eventName);
- if (!isset($this->listeners[$eventName])) {
- return $event;
+ if ($listeners = $this->getListeners($eventName)) {
+ $this->doDispatch($listeners, $eventName, $event);
}
- $this->doDispatch($this->getListeners($eventName), $eventName, $event);
-
return $event;
}
/**
- * @see EventDispatcherInterface::getListeners()
+ * {@inheritdoc}
*/
public function getListeners($eventName = null)
{
if (null !== $eventName) {
+ if (!isset($this->listeners[$eventName])) {
+ return array();
+ }
+
if (!isset($this->sorted[$eventName])) {
$this->sortListeners($eventName);
}
@@ -78,7 +78,7 @@ public function getListeners($eventName = null)
}
/**
- * @see EventDispatcherInterface::hasListeners()
+ * {@inheritdoc}
*/
public function hasListeners($eventName = null)
{
@@ -86,9 +86,7 @@ public function hasListeners($eventName = null)
}
/**
- * @see EventDispatcherInterface::addListener()
- *
- * @api
+ * {@inheritdoc}
*/
public function addListener($eventName, $listener, $priority = 0)
{
@@ -97,7 +95,7 @@ public function addListener($eventName, $listener, $priority = 0)
}
/**
- * @see EventDispatcherInterface::removeListener()
+ * {@inheritdoc}
*/
public function removeListener($eventName, $listener)
{
@@ -113,9 +111,7 @@ public function removeListener($eventName, $listener)
}
/**
- * @see EventDispatcherInterface::addSubscriber()
- *
- * @api
+ * {@inheritdoc}
*/
public function addSubscriber(EventSubscriberInterface $subscriber)
{
@@ -133,7 +129,7 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
}
/**
- * @see EventDispatcherInterface::removeSubscriber()
+ * {@inheritdoc}
*/
public function removeSubscriber(EventSubscriberInterface $subscriber)
{
@@ -177,9 +173,7 @@ private function sortListeners($eventName)
{
$this->sorted[$eventName] = array();
- if (isset($this->listeners[$eventName])) {
- krsort($this->listeners[$eventName]);
- $this->sorted[$eventName] = call_user_func_array('array_merge', $this->listeners[$eventName]);
- }
+ krsort($this->listeners[$eventName]);
+ $this->sorted[$eventName] = call_user_func_array('array_merge', $this->listeners[$eventName]);
}
}
diff --git a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
index 199d2c00715b3e1dfaa7e1ca85ae243bd4afe60a..2e4c3fd97ff0faf012e213f55b0f925ce24fe8f6 100644
--- a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
+++ b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\EventDispatcher\Tests;
use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
abstract class AbstractEventDispatcherTest extends \PHPUnit_Framework_TestCase
diff --git a/vendor/symfony/http-foundation/Tests/ClockMock.php b/vendor/symfony/http-foundation/Tests/ClockMock.php
index 04a842d9b50576a32b66aef0bc97cea82f1a15bf..aa954db42901743c09ad53166bc9d5c473ee573a 100644
--- a/vendor/symfony/http-foundation/Tests/ClockMock.php
+++ b/vendor/symfony/http-foundation/Tests/ClockMock.php
@@ -11,14 +11,29 @@
namespace Symfony\Component\HttpFoundation;
-function time($asFloat = false)
+function time()
{
return Tests\time();
}
namespace Symfony\Component\HttpFoundation\Tests;
+function with_clock_mock($enable = null)
+{
+ static $enabled;
+
+ if (null === $enable) {
+ return $enabled;
+ }
+
+ $enabled = $enable;
+}
+
function time()
{
+ if (!with_clock_mock()) {
+ return \time();
+ }
+
return $_SERVER['REQUEST_TIME'];
}
diff --git a/vendor/symfony/http-foundation/Tests/CookieTest.php b/vendor/symfony/http-foundation/Tests/CookieTest.php
index b8474db15fa0ffc9d980f13b17bdeebe0167bdbd..378e1c5c573b981477706372a8c5ce3b3a9091c9 100644
--- a/vendor/symfony/http-foundation/Tests/CookieTest.php
+++ b/vendor/symfony/http-foundation/Tests/CookieTest.php
@@ -23,6 +23,16 @@
*/
class CookieTest extends \PHPUnit_Framework_TestCase
{
+ protected function setUp()
+ {
+ with_clock_mock(true);
+ }
+
+ protected function tearDown()
+ {
+ with_clock_mock(false);
+ }
+
public function invalidNames()
{
return array(
diff --git a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
index 0fa198e09870201937718de854de6f320f613e7f..09aac42e58bcedd9bc02f9327f43ea7ce6137f73 100644
--- a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
@@ -18,6 +18,16 @@
class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
{
+ protected function setUp()
+ {
+ with_clock_mock(true);
+ }
+
+ protected function tearDown()
+ {
+ with_clock_mock(false);
+ }
+
/**
* @covers Symfony\Component\HttpFoundation\ResponseHeaderBag::allPreserveCase
* @dataProvider provideAllPreserveCase
diff --git a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
index efb0bb3e6e8799a58e967e5ced7d72354fc7a804..e0d7d50f6b89e171baca9ecd763a1ffb4e2a4d5c 100644
--- a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
@@ -98,9 +98,9 @@ public function dump(Data $data)
} elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
$info = $trace[$i]['object'];
$name = $info->getTemplateName();
- $src = $info->getEnvironment()->getLoader()->getSource($name);
+ $src = method_exists($info, 'getSource') ? $info->getSource() : $info->getEnvironment()->getLoader()->getSource($name);
$info = $info->getDebugInfo();
- if (isset($info[$trace[$i - 1]['line']])) {
+ if (null !== $src && isset($info[$trace[$i - 1]['line']])) {
$file = false;
$line = $info[$trace[$i - 1]['line']];
$src = explode("\n", $src);
diff --git a/vendor/symfony/http-kernel/HttpCache/Esi.php b/vendor/symfony/http-kernel/HttpCache/Esi.php
index e4e0a4be6f1a0ce6bdfead5917e890e4a665fd18..e40ba0269c9b205f6bf4c03e6edb18c41646308c 100644
--- a/vendor/symfony/http-kernel/HttpCache/Esi.php
+++ b/vendor/symfony/http-kernel/HttpCache/Esi.php
@@ -213,8 +213,8 @@ public function process(Request $request, Response $response)
// we don't use a proper XML parser here as we can have ESI tags in a plain text response
$content = $response->getContent();
- $content = preg_replace('#<esi\:remove>.*?</esi\:remove>#', '', $content);
- $content = preg_replace('#<esi\:comment[^>]*(?:/|</esi\:comment)>#', '', $content);
+ $content = preg_replace('#<esi\:remove>.*?</esi\:remove>#s', '', $content);
+ $content = preg_replace('#<esi\:comment[^>]+>#s', '', $content);
$chunks = preg_split('#<esi\:include\s+(.*?)\s*(?:/|</esi\:include)>#', $content, -1, PREG_SPLIT_DELIM_CAPTURE);
$chunks[0] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[0]);
diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php
index 5511a08a46ed7cdb0774ea3f970b23d4510d7786..662428b7250ed231d7e0a86e7e43d6f70f8f1b3f 100644
--- a/vendor/symfony/http-kernel/Kernel.php
+++ b/vendor/symfony/http-kernel/Kernel.php
@@ -60,11 +60,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '2.7.4';
- const VERSION_ID = '20704';
- const MAJOR_VERSION = '2';
- const MINOR_VERSION = '7';
- const RELEASE_VERSION = '4';
+ const VERSION = '2.7.5';
+ const VERSION_ID = 20705;
+ const MAJOR_VERSION = 2;
+ const MINOR_VERSION = 7;
+ const RELEASE_VERSION = 5;
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '05/2018';
diff --git a/vendor/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php b/vendor/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
index 184175cc81aa7ee869984c45ebbf379b1d626891..1b5f47119afc6d262abe293c2dda9d400ead4698 100644
--- a/vendor/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -55,7 +55,7 @@ public function testGenerateFragmentUriWithARequest()
}
/**
- * @expectedException LogicException
+ * @expectedException \LogicException
* @dataProvider getGenerateFragmentUriDataWithNonScalar
*/
public function testGenerateFragmentUriWithNonScalar($controller)
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php
index 00a93676004cf3025da36f0b40991b14e30a2676..0d52ce89dbc2668229b08021008ff1620b8cea5d 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php
@@ -92,6 +92,28 @@ public function testProcessDoesNothingIfContentTypeIsNotHtml()
$this->assertFalse($response->headers->has('x-body-eval'));
}
+ public function testMultilineEsiRemoveTagsAreRemoved()
+ {
+ $esi = new Esi();
+
+ $request = Request::create('/');
+ $response = new Response('<esi:remove> <a href="http://www.example.com">www.example.com</a> </esi:remove> Keep this'."<esi:remove>\n <a>www.example.com</a> </esi:remove> And this");
+ $esi->process($request, $response);
+
+ $this->assertEquals(' Keep this And this', $response->getContent());
+ }
+
+ public function testCommentTagsAreRemoved()
+ {
+ $esi = new Esi();
+
+ $request = Request::create('/');
+ $response = new Response('<esi:comment text="some comment >" /> Keep this');
+ $esi->process($request, $response);
+
+ $this->assertEquals(' Keep this', $response->getContent());
+ }
+
public function testProcess()
{
$esi = new Esi();
diff --git a/vendor/symfony/http-kernel/Tests/KernelTest.php b/vendor/symfony/http-kernel/Tests/KernelTest.php
index 753125ca8566cdf9282343f5a71c70b33eb18f65..edb31423563db68edfe22b364b9b0ad0c1912241 100644
--- a/vendor/symfony/http-kernel/Tests/KernelTest.php
+++ b/vendor/symfony/http-kernel/Tests/KernelTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\HttpKernel\Config\EnvParametersResource;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\HttpKernel\HttpKernelInterface;
diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php
index 1474d698276482190d3ad1b7a7f2f096cb0c9367..f87792be7a5fdf31dafb691af7c6dfbde63aaca3 100644
--- a/vendor/symfony/process/Process.php
+++ b/vendor/symfony/process/Process.php
@@ -275,7 +275,7 @@ public function start($callback = null)
$commandline = $this->commandline;
if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
- $commandline = 'cmd /V:ON /E:ON /C "('.$commandline.')';
+ $commandline = 'cmd /V:ON /E:ON /D /C "('.$commandline.')';
foreach ($this->processPipes->getFiles() as $offset => $filename) {
$commandline .= ' '.$offset.'>'.ProcessUtils::escapeArgument($filename);
}
diff --git a/vendor/symfony/routing/Loader/YamlFileLoader.php b/vendor/symfony/routing/Loader/YamlFileLoader.php
index d30da91d2a45dc045113cdc1c0b78fece2144be6..4ae71ac75814323b5588ed478f1f454d84c06b9b 100644
--- a/vendor/symfony/routing/Loader/YamlFileLoader.php
+++ b/vendor/symfony/routing/Loader/YamlFileLoader.php
@@ -14,6 +14,7 @@
use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\Route;
use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Yaml\Exception\ParseException;
use Symfony\Component\Yaml\Parser as YamlParser;
use Symfony\Component\Config\Loader\FileLoader;
@@ -60,7 +61,11 @@ public function load($file, $type = null)
$this->yamlParser = new YamlParser();
}
- $config = $this->yamlParser->parse(file_get_contents($path));
+ try {
+ $config = $this->yamlParser->parse(file_get_contents($path));
+ } catch (ParseException $e) {
+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+ }
$collection = new RouteCollection();
$collection->addResource(new FileResource($path));
diff --git a/vendor/symfony/routing/Tests/Fixtures/bad_format.yml b/vendor/symfony/routing/Tests/Fixtures/bad_format.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8ba50e2e4281619d4c5671c7799a19f62b995c8b
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/bad_format.yml
@@ -0,0 +1,3 @@
+blog_show:
+ path: /blog/{slug}
+ defaults: { _controller: "MyBundle:Blog:show" }
diff --git a/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
index 17e07dab193099b01de92bf7891c5c9899e536a8..de1542040b143cb3b3c61a95a1ae810183b03630 100644
--- a/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
@@ -51,7 +51,15 @@ public function testLoadThrowsExceptionWithInvalidFile($filePath)
public function getPathsToInvalidFiles()
{
- return array(array('nonvalid.yml'), array('nonvalid2.yml'), array('incomplete.yml'), array('nonvalidkeys.yml'), array('nonesense_resource_plus_path.yml'), array('nonesense_type_without_resource.yml'));
+ return array(
+ array('nonvalid.yml'),
+ array('nonvalid2.yml'),
+ array('incomplete.yml'),
+ array('nonvalidkeys.yml'),
+ array('nonesense_resource_plus_path.yml'),
+ array('nonesense_type_without_resource.yml'),
+ array('bad_format.yml'),
+ );
}
public function testLoadSpecialRouteName()
diff --git a/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php b/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
index 6075b270baa6b94e19d8c467107099fbee8b5430..cf6dd92dcad9bd71616359aa4b1d90eea4d6038a 100644
--- a/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
+++ b/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Mapping\Loader;
use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Yaml\Exception\ParseException;
use Symfony\Component\Yaml\Parser as YamlParser;
/**
@@ -117,7 +118,11 @@ protected function parseNodes(array $nodes)
*/
private function parseFile($path)
{
- $classes = $this->yamlParser->parse(file_get_contents($path));
+ try {
+ $classes = $this->yamlParser->parse(file_get_contents($path));
+ } catch (ParseException $e) {
+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+ }
// empty file
if (null === $classes) {
diff --git a/vendor/symfony/validator/Mapping/MetadataInterface.php b/vendor/symfony/validator/Mapping/MetadataInterface.php
index 991962ceafd2d737b3e7bc6201e59ade697e8b9e..e5f09e17edc82d453799f5c7eed89d7a07ba3c58 100644
--- a/vendor/symfony/validator/Mapping/MetadataInterface.php
+++ b/vendor/symfony/validator/Mapping/MetadataInterface.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Mapping;
+use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\MetadataInterface as LegacyMetadataInterface;
/**
diff --git a/vendor/symfony/validator/Resources/translations/validators.sv.xlf b/vendor/symfony/validator/Resources/translations/validators.sv.xlf
index fbcb5f2b99f22baf58096b24f633857cd4a66763..693f12b5b1998e9a5f678d5029f97d2aace17209 100644
--- a/vendor/symfony/validator/Resources/translations/validators.sv.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.sv.xlf
@@ -302,6 +302,14 @@
<source>An empty file is not allowed.</source>
<target>En tom fil är inte tillåten.</target>
</trans-unit>
+ <trans-unit id="79">
+ <source>The host could not be resolved.</source>
+ <target>Värddatorn kunde inte hittas.</target>
+ </trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>Detta värde har inte den förväntade teckenkodningen {{ charset }}.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
index fb85315b3334a0b1fad5f317810ad6ad64d75e8b..aa111a37f3d5a22ce73ab14e1baee213c1cc8623 100644
--- a/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
+++ b/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -36,7 +36,7 @@ abstract class AbstractComparisonValidatorTestCase extends AbstractConstraintVal
{
protected static function addPhp5Dot5Comparisons(array $comparisons)
{
- if (version_compare(PHP_VERSION, '5.5.0-dev', '<')) {
+ if (PHP_VERSION_ID < 50500) {
return $comparisons;
}
diff --git a/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php
index 4b71062f059354b08c8e37cacfcfbf7839a753ee..1acb41a66ccd7042538d0cb89a42b8a72ce2361b 100644
--- a/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php
@@ -64,7 +64,7 @@ public function provideValidComparisons()
array(null, 1),
);
- if (version_compare(PHP_VERSION, '>=', '5.5')) {
+ if (PHP_VERSION_ID >= 50500) {
$immutableDate = new \DateTimeImmutable('2000-01-01');
$comparisons[] = array($immutableDate, $immutableDate);
}
diff --git a/vendor/symfony/validator/Tests/Constraints/RangeValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/RangeValidatorTest.php
index 9b7056b548735415a449e48837be3593b47f85af..b43cc20d3c9ffeb0f0dbecfe5764d1c85203b27f 100644
--- a/vendor/symfony/validator/Tests/Constraints/RangeValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/RangeValidatorTest.php
@@ -194,7 +194,7 @@ public function getTenthToTwentiethMarch2014()
array(new \DateTime('March 20, 2014')),
);
- if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+ if (PHP_VERSION_ID >= 50500) {
$tests[] = array(new \DateTimeImmutable('March 10, 2014'));
$tests[] = array(new \DateTimeImmutable('March 15, 2014'));
$tests[] = array(new \DateTimeImmutable('March 20, 2014'));
@@ -216,7 +216,7 @@ public function getSoonerThanTenthMarch2014()
array(new \DateTime('March 9, 2014'), 'Mar 9, 2014, 12:00 AM'),
);
- if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+ if (PHP_VERSION_ID >= 50500) {
$tests[] = array(new \DateTimeImmutable('March 20, 2013'), 'Mar 20, 2013, 12:00 AM');
$tests[] = array(new \DateTimeImmutable('March 9, 2014'), 'Mar 9, 2014, 12:00 AM');
}
@@ -237,7 +237,7 @@ public function getLaterThanTwentiethMarch2014()
array(new \DateTime('March 9, 2015'), 'Mar 9, 2015, 12:00 AM'),
);
- if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+ if (PHP_VERSION_ID >= 50500) {
$tests[] = array(new \DateTimeImmutable('March 21, 2014'), 'Mar 21, 2014, 12:00 AM');
$tests[] = array(new \DateTimeImmutable('March 9, 2015'), 'Mar 9, 2015, 12:00 AM');
}
diff --git a/vendor/symfony/validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/vendor/symfony/validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 407e36958e389d899578bb6985aadfd935757312..2ca64122aafaed253a4a7c69693962a0d56a2303 100644
--- a/vendor/symfony/validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -33,15 +33,26 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()
$this->assertFalse($loader->loadClassMetadata($metadata));
}
- public function testLoadClassMetadataThrowsExceptionIfNotAnArray()
+ /**
+ * @dataProvider provideInvalidYamlFiles
+ * @expectedException \InvalidArgumentException
+ */
+ public function testInvalidYamlFiles($path)
{
- $loader = new YamlFileLoader(__DIR__.'/nonvalid-mapping.yml');
+ $loader = new YamlFileLoader(__DIR__.'/'.$path);
$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
- $this->setExpectedException('\InvalidArgumentException');
$loader->loadClassMetadata($metadata);
}
+ public function provideInvalidYamlFiles()
+ {
+ return array(
+ array('nonvalid-mapping.yml'),
+ array('bad-format.yml'),
+ );
+ }
+
/**
* @see https://github.com/symfony/symfony/pull/12158
*/
diff --git a/vendor/symfony/validator/Tests/Mapping/Loader/bad-format.yml b/vendor/symfony/validator/Tests/Mapping/Loader/bad-format.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d2b4ad2654d36d2d5bd5d7150d182eaa4723b797
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Mapping/Loader/bad-format.yml
@@ -0,0 +1,9 @@
+namespaces:
+ custom: Symfony\Component\Validator\Tests\Fixtures\
+
+Symfony\Component\Validator\Tests\Fixtures\Entity:
+ constraints:
+ # Custom constraint
+ - Symfony\Component\Validator\Tests\Fixtures\ConstraintA: ~
+ # Custom constraint with namespaces prefix
+ - "custom:ConstraintB": ~
diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php
index ad7ae498ff1ab51a06bd54121c81f1f9f2bb6698..651c017049664e453d1e9b68f1fd514bc14b5500 100644
--- a/vendor/symfony/yaml/Parser.php
+++ b/vendor/symfony/yaml/Parser.php
@@ -135,6 +135,11 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
throw $e;
}
+ // Convert float keys to strings, to avoid being converted to integers by PHP
+ if (is_float($key)) {
+ $key = (string) $key;
+ }
+
if ('<<' === $key) {
$mergeNode = true;
$allowOverwrite = true;
diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php
index f434d5585d8eab004d3b0eea29b6fffb13ab5cea..08ef43faa51c861af85fcb64cbea0559dc502aaf 100644
--- a/vendor/symfony/yaml/Tests/ParserTest.php
+++ b/vendor/symfony/yaml/Tests/ParserTest.php
@@ -747,6 +747,24 @@ public function testYamlDirective()
EOF;
$this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml));
}
+
+ public function testFloatKeys()
+ {
+ $yaml = <<<EOF
+foo:
+ 1.2: "bar"
+ 1.3: "baz"
+EOF;
+
+ $expected = array(
+ 'foo' => array(
+ '1.2' => 'bar',
+ '1.3' => 'baz',
+ ),
+ );
+
+ $this->assertEquals($expected, $this->parser->parse($yaml));
+ }
}
class B