diff --git a/composer.json b/composer.json
index 974dc0e52ca1fc56d64c0153cc12ae2e876050b7..8bc14b63d2b1a2f7f1b3676e2f989aa683fcf33c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,16 +6,17 @@
"require": {
"php": ">=5.4.5",
"sdboyer/gliph": "0.1.*",
- "symfony/class-loader": "2.5.*",
- "symfony/css-selector": "2.5.*",
- "symfony/dependency-injection": "2.5.*",
- "symfony/event-dispatcher": "2.5.*",
- "symfony/http-foundation": "2.5.*",
- "symfony/http-kernel": "2.5.*",
- "symfony/routing": "2.5.*",
- "symfony/serializer": "2.5.*",
- "symfony/validator": "2.5.*",
- "symfony/yaml": "dev-master#499f7d7aa96747ad97940089bd7a1fb24ad8182a",
+ "symfony/class-loader": "2.6.0-beta1",
+ "symfony/css-selector": "2.6.0-beta1",
+ "symfony/debug": "2.6.0-beta1",
+ "symfony/dependency-injection": "2.6.0-beta1",
+ "symfony/event-dispatcher": "2.6.0-beta1",
+ "symfony/http-foundation": "2.6.0-beta1",
+ "symfony/http-kernel": "2.6.0-beta1",
+ "symfony/routing": "2.6.0-beta1",
+ "symfony/serializer": "2.6.0-beta1",
+ "symfony/validator": "2.6.0-beta1",
+ "symfony/yaml": "2.6.0-beta1",
"twig/twig": "1.16.*",
"doctrine/common": "dev-master#a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
"doctrine/annotations": "1.2.*",
diff --git a/composer.lock b/composer.lock
index 4849c757d7f4973e0e6a5565e96fbaa9eda9010f..868008a906475761426e1b60cb286725813fcbeb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "2bd5814ec010b13a6997359736b58695",
+ "hash": "34a4f5a56891e51217c305b97e8cc675",
"packages": [
{
"name": "doctrine/annotations",
@@ -518,16 +518,16 @@
},
{
"name": "egulias/email-validator",
- "version": "1.2.2",
+ "version": "1.2.5",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "39b451bb2bb0655d83d82a38a0bba7189298cfc5"
+ "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/39b451bb2bb0655d83d82a38a0bba7189298cfc5",
- "reference": "39b451bb2bb0655d83d82a38a0bba7189298cfc5",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
+ "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
"shasum": ""
},
"require": {
@@ -540,7 +540,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -564,7 +564,7 @@
"validation",
"validator"
],
- "time": "2014-09-01 22:35:48"
+ "time": "2014-11-06 08:59:44"
},
{
"name": "guzzlehttp/guzzle",
@@ -626,16 +626,16 @@
},
{
"name": "guzzlehttp/ringphp",
- "version": "1.0.0",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/RingPHP.git",
- "reference": "9e44b565d726d9614cd970319e6eea70ee15bff3"
+ "reference": "e7c28f96c5ac12ab0e63412cfc15989756fcb964"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/9e44b565d726d9614cd970319e6eea70ee15bff3",
- "reference": "9e44b565d726d9614cd970319e6eea70ee15bff3",
+ "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/e7c28f96c5ac12ab0e63412cfc15989756fcb964",
+ "reference": "e7c28f96c5ac12ab0e63412cfc15989756fcb964",
"shasum": ""
},
"require": {
@@ -672,7 +672,7 @@
"homepage": "https://github.com/mtdowling"
}
],
- "time": "2014-10-13 00:59:38"
+ "time": "2014-11-04 07:01:14"
},
{
"name": "guzzlehttp/streams",
@@ -1386,16 +1386,16 @@
},
{
"name": "sebastian/environment",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "6288ebbf6fa3ed2b2ff2d69c356fbaaf4f0971a7"
+ "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6288ebbf6fa3ed2b2ff2d69c356fbaaf4f0971a7",
- "reference": "6288ebbf6fa3ed2b2ff2d69c356fbaaf4f0971a7",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d",
+ "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d",
"shasum": ""
},
"require": {
@@ -1407,7 +1407,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -1432,7 +1432,7 @@
"environment",
"hhvm"
],
- "time": "2014-10-07 09:23:16"
+ "time": "2014-10-22 06:38:05"
},
{
"name": "sebastian/exporter",
@@ -1643,17 +1643,17 @@
},
{
"name": "symfony/class-loader",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/ClassLoader",
"source": {
"type": "git",
"url": "https://github.com/symfony/ClassLoader.git",
- "reference": "432561f655123b003b32f370ca812fed9a9340c6"
+ "reference": "d1a16139ea522ec3cc20801b7e19cd3cafd12d8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/432561f655123b003b32f370ca812fed9a9340c6",
- "reference": "432561f655123b003b32f370ca812fed9a9340c6",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/d1a16139ea522ec3cc20801b7e19cd3cafd12d8c",
+ "reference": "d1a16139ea522ec3cc20801b7e19cd3cafd12d8c",
"shasum": ""
},
"require": {
@@ -1665,7 +1665,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1689,21 +1689,21 @@
],
"description": "Symfony ClassLoader Component",
"homepage": "http://symfony.com",
- "time": "2014-09-22 09:14:18"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "symfony/css-selector",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
- "reference": "caf5ecc3face1f22884fb74b8edab65ac5ba9976"
+ "reference": "41953ad30ffc5cd710d106cf01eff79f6effa117"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/caf5ecc3face1f22884fb74b8edab65ac5ba9976",
- "reference": "caf5ecc3face1f22884fb74b8edab65ac5ba9976",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/41953ad30ffc5cd710d106cf01eff79f6effa117",
+ "reference": "41953ad30ffc5cd710d106cf01eff79f6effa117",
"shasum": ""
},
"require": {
@@ -1712,7 +1712,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1740,25 +1740,26 @@
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com",
- "time": "2014-09-22 09:14:18"
+ "time": "2014-10-26 07:46:28"
},
{
"name": "symfony/debug",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/Debug",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
- "reference": "4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648"
+ "reference": "3548595c26175fdaca19cbec204668c22cda41f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648",
- "reference": "4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/3548595c26175fdaca19cbec204668c22cda41f0",
+ "reference": "3548595c26175fdaca19cbec204668c22cda41f0",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "psr/log": "~1.0"
},
"require-dev": {
"symfony/http-foundation": "~2.1",
@@ -1771,7 +1772,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1795,21 +1796,21 @@
],
"description": "Symfony Debug Component",
"homepage": "http://symfony.com",
- "time": "2014-09-28 15:22:14"
+ "time": "2014-10-28 10:06:58"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "1f01a64c9047909e40700a14ee34e8c446300618"
+ "reference": "926500fe0b8a6562c4e8b8166a1cb664733804aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/1f01a64c9047909e40700a14ee34e8c446300618",
- "reference": "1f01a64c9047909e40700a14ee34e8c446300618",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/926500fe0b8a6562c4e8b8166a1cb664733804aa",
+ "reference": "926500fe0b8a6562c4e8b8166a1cb664733804aa",
"shasum": ""
},
"require": {
@@ -1828,7 +1829,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1852,21 +1853,21 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com",
- "time": "2014-09-27 08:35:39"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "f6281337bf5f985f585d1db6a83adb05ce531f46"
+ "reference": "dcf345d5ed96bc6c3b4521c1989670d2c9e5014e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f6281337bf5f985f585d1db6a83adb05ce531f46",
- "reference": "f6281337bf5f985f585d1db6a83adb05ce531f46",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/dcf345d5ed96bc6c3b4521c1989670d2c9e5014e",
+ "reference": "dcf345d5ed96bc6c3b4521c1989670d2c9e5014e",
"shasum": ""
},
"require": {
@@ -1875,7 +1876,8 @@
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0",
- "symfony/dependency-injection": "~2.0,<2.6.0",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
"symfony/stopwatch": "~2.2"
},
"suggest": {
@@ -1885,7 +1887,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1909,21 +1911,21 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2014-09-28 15:56:11"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "symfony/http-foundation",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
- "reference": "650e115af152d7a5e857d01c2cdb9a22809de9b4"
+ "reference": "4cd6c807598e560db7b3da50c4330fdb4808cfa1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/650e115af152d7a5e857d01c2cdb9a22809de9b4",
- "reference": "650e115af152d7a5e857d01c2cdb9a22809de9b4",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/4cd6c807598e560db7b3da50c4330fdb4808cfa1",
+ "reference": "4cd6c807598e560db7b3da50c4330fdb4808cfa1",
"shasum": ""
},
"require": {
@@ -1935,7 +1937,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1962,27 +1964,27 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
- "time": "2014-09-25 09:52:29"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "symfony/http-kernel",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
- "reference": "6a3595611229def14d5e644f060cf372235532ec"
+ "reference": "7fa0bd9220cd529ee78d8565bbf8d5a854bd72d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6a3595611229def14d5e644f060cf372235532ec",
- "reference": "6a3595611229def14d5e644f060cf372235532ec",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/7fa0bd9220cd529ee78d8565bbf8d5a854bd72d2",
+ "reference": "7fa0bd9220cd529ee78d8565bbf8d5a854bd72d2",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"psr/log": "~1.0",
- "symfony/debug": "~2.5",
+ "symfony/debug": "~2.6",
"symfony/event-dispatcher": "~2.5",
"symfony/http-foundation": "~2.5"
},
@@ -1997,7 +1999,9 @@
"symfony/process": "~2.0",
"symfony/routing": "~2.2",
"symfony/stopwatch": "~2.2",
- "symfony/templating": "~2.2"
+ "symfony/templating": "~2.2",
+ "symfony/translation": "~2.0",
+ "symfony/var-dumper": "~2.6"
},
"suggest": {
"symfony/browser-kit": "",
@@ -2005,12 +2009,13 @@
"symfony/config": "",
"symfony/console": "",
"symfony/dependency-injection": "",
- "symfony/finder": ""
+ "symfony/finder": "",
+ "symfony/var-dumper": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2034,68 +2039,21 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
- "time": "2014-09-28 17:33:53"
- },
- {
- "name": "symfony/process",
- "version": "v2.5.5",
- "target-dir": "Symfony/Component/Process",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "8a1ec96c4e519cee0fb971ea48a1eb7369dda54b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/8a1ec96c4e519cee0fb971ea48a1eb7369dda54b",
- "reference": "8a1ec96c4e519cee0fb971ea48a1eb7369dda54b",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.5-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Process\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony Process Component",
- "homepage": "http://symfony.com",
- "time": "2014-09-23 05:25:11"
+ "time": "2014-11-03 20:15:26"
},
{
"name": "symfony/routing",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
- "reference": "9bc38fe72e0eff61611e7cd4df3accbce20b1d36"
+ "reference": "f0bb6f818f9a7ece41c7dfe14e08b13c2de55b0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/9bc38fe72e0eff61611e7cd4df3accbce20b1d36",
- "reference": "9bc38fe72e0eff61611e7cd4df3accbce20b1d36",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/f0bb6f818f9a7ece41c7dfe14e08b13c2de55b0c",
+ "reference": "f0bb6f818f9a7ece41c7dfe14e08b13c2de55b0c",
"shasum": ""
},
"require": {
@@ -2118,7 +2076,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2148,21 +2106,21 @@
"uri",
"url"
],
- "time": "2014-09-22 15:28:36"
+ "time": "2014-11-03 19:16:49"
},
{
"name": "symfony/serializer",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/Serializer",
"source": {
"type": "git",
"url": "https://github.com/symfony/Serializer.git",
- "reference": "a95c0471682778da2e02169fb2644d3b08d4470f"
+ "reference": "e96b7ac54b3d75a458f76eab11b7cd2d757f09f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/a95c0471682778da2e02169fb2644d3b08d4470f",
- "reference": "a95c0471682778da2e02169fb2644d3b08d4470f",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/e96b7ac54b3d75a458f76eab11b7cd2d757f09f1",
+ "reference": "e96b7ac54b3d75a458f76eab11b7cd2d757f09f1",
"shasum": ""
},
"require": {
@@ -2171,7 +2129,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2195,21 +2153,21 @@
],
"description": "Symfony Serializer Component",
"homepage": "http://symfony.com",
- "time": "2014-09-22 09:14:18"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "symfony/translation",
- "version": "v2.5.5",
+ "version": "v2.5.6",
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
- "reference": "170c0d895616e1a6a35681ffb0b9e339f58ab928"
+ "reference": "362fe4da2cfe587f72d57aaa2f89e6b61c05dedf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/170c0d895616e1a6a35681ffb0b9e339f58ab928",
- "reference": "170c0d895616e1a6a35681ffb0b9e339f58ab928",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/362fe4da2cfe587f72d57aaa2f89e6b61c05dedf",
+ "reference": "362fe4da2cfe587f72d57aaa2f89e6b61c05dedf",
"shasum": ""
},
"require": {
@@ -2251,21 +2209,21 @@
],
"description": "Symfony Translation Component",
"homepage": "http://symfony.com",
- "time": "2014-09-23 05:25:11"
+ "time": "2014-10-01 05:50:18"
},
{
"name": "symfony/validator",
- "version": "v2.5.5",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/Validator",
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
- "reference": "64f61505843ca5e6c647244f5a4b6812c1279427"
+ "reference": "6e521cdbc963cef7daf9931a7bde48b56d67d10a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/64f61505843ca5e6c647244f5a4b6812c1279427",
- "reference": "64f61505843ca5e6c647244f5a4b6812c1279427",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/6e521cdbc963cef7daf9931a7bde48b56d67d10a",
+ "reference": "6e521cdbc963cef7daf9931a7bde48b56d67d10a",
"shasum": ""
},
"require": {
@@ -2297,7 +2255,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2321,21 +2279,21 @@
],
"description": "Symfony Validator Component",
"homepage": "http://symfony.com",
- "time": "2014-09-28 15:22:14"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "symfony/yaml",
- "version": "dev-master",
+ "version": "v2.6.0-BETA1",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "499f7d7aa96747ad97940089bd7a1fb24ad8182a"
+ "reference": "9da3813f36985a4089f7e83c601a1034d125ff69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/499f7d7aa96747ad97940089bd7a1fb24ad8182a",
- "reference": "499f7d7aa96747ad97940089bd7a1fb24ad8182a",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/9da3813f36985a4089f7e83c601a1034d125ff69",
+ "reference": "9da3813f36985a4089f7e83c601a1034d125ff69",
"shasum": ""
},
"require": {
@@ -2368,7 +2326,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-10-05 13:53:50"
+ "time": "2014-11-03 03:55:50"
},
{
"name": "twig/twig",
@@ -2564,7 +2522,17 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
- "symfony/yaml": 20,
+ "symfony/class-loader": 10,
+ "symfony/css-selector": 10,
+ "symfony/debug": 10,
+ "symfony/dependency-injection": 10,
+ "symfony/event-dispatcher": 10,
+ "symfony/http-foundation": 10,
+ "symfony/http-kernel": 10,
+ "symfony/routing": 10,
+ "symfony/serializer": 10,
+ "symfony/validator": 10,
+ "symfony/yaml": 10,
"doctrine/common": 20,
"phpunit/phpunit-mock-objects": 20
},
diff --git a/core/lib/Drupal/Core/Routing/CompiledRoute.php b/core/lib/Drupal/Core/Routing/CompiledRoute.php
index 45aa22c7072d3d81cba46a26d4432839b768f3c4..7354e1225a460621c2f2bc661e8fb5f19b702506 100644
--- a/core/lib/Drupal/Core/Routing/CompiledRoute.php
+++ b/core/lib/Drupal/Core/Routing/CompiledRoute.php
@@ -173,4 +173,30 @@ public function getRequirements() {
return $this->route->getRequirements();
}
+ /**
+ * {@inheritdoc}
+ */
+ public function serialize() {
+ $data = unserialize(parent::serialize());
+ $data['fit'] = $this->fit;
+ $data['patternOutline'] = $this->patternOutline;
+ $data['numParts'] = $this->numParts;
+
+ return serialize($data);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function unserialize($serialized)
+ {
+ parent::unserialize($serialized);
+ $data = unserialize($serialized);
+
+ $this->fit = $data['fit'];
+ $this->patternOutline = $data['patternOutline'];
+ $this->numParts = $data['numParts'];
+ }
+
+
}
diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php
index 54e2998cc44cc37844dae599815aa74afaea8ded..18472d710f2bb9643b8d327c4ec70612bd404224 100644
--- a/core/vendor/composer/autoload_namespaces.php
+++ b/core/vendor/composer/autoload_namespaces.php
@@ -16,7 +16,6 @@
'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
- 'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 06b603a10a6ea507ba080f78fb99d1e623d35f9b..03eef6892f12bd07f2d2b578842e029e0d645b60 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -469,58 +469,6 @@
"sparql"
]
},
- {
- "name": "egulias/email-validator",
- "version": "1.2.2",
- "version_normalized": "1.2.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/egulias/EmailValidator.git",
- "reference": "39b451bb2bb0655d83d82a38a0bba7189298cfc5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/39b451bb2bb0655d83d82a38a0bba7189298cfc5",
- "reference": "39b451bb2bb0655d83d82a38a0bba7189298cfc5",
- "shasum": ""
- },
- "require": {
- "doctrine/lexer": "~1.0",
- "php": ">= 5.3.3"
- },
- "require-dev": {
- "satooshi/php-coveralls": "dev-master"
- },
- "time": "2014-09-01 22:35:48",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Egulias\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Eduardo Gulias Davis"
- }
- ],
- "description": "A library for validating emails",
- "homepage": "https://github.com/egulias/EmailValidator",
- "keywords": [
- "email",
- "validation",
- "validator"
- ]
- },
{
"name": "react/promise",
"version": "v2.1.0",
@@ -619,58 +567,6 @@
"stream"
]
},
- {
- "name": "guzzlehttp/ringphp",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/RingPHP.git",
- "reference": "9e44b565d726d9614cd970319e6eea70ee15bff3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/9e44b565d726d9614cd970319e6eea70ee15bff3",
- "reference": "9e44b565d726d9614cd970319e6eea70ee15bff3",
- "shasum": ""
- },
- "require": {
- "guzzlehttp/streams": "~3.0",
- "php": ">=5.4.0",
- "react/promise": "~2.0"
- },
- "require-dev": {
- "ext-curl": "*",
- "phpunit/phpunit": "~4.0"
- },
- "suggest": {
- "ext-curl": "Guzzle will use specific adapters if cURL is present"
- },
- "time": "2014-10-13 00:59:38",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "GuzzleHttp\\Ring\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- }
- ]
- },
{
"name": "mikey179/vfsStream",
"version": "v1.4.0",
@@ -762,55 +658,6 @@
"tokenizer"
]
},
- {
- "name": "symfony/yaml",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "target-dir": "Symfony/Component/Yaml",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "499f7d7aa96747ad97940089bd7a1fb24ad8182a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/499f7d7aa96747ad97940089bd7a1fb24ad8182a",
- "reference": "499f7d7aa96747ad97940089bd7a1fb24ad8182a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2014-10-05 13:53:50",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Yaml\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony Yaml Component",
- "homepage": "http://symfony.com"
- },
{
"name": "sebastian/version",
"version": "1.0.3",
@@ -915,58 +762,6 @@
"exporter"
]
},
- {
- "name": "sebastian/environment",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "6288ebbf6fa3ed2b2ff2d69c356fbaaf4f0971a7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6288ebbf6fa3ed2b2ff2d69c356fbaaf4f0971a7",
- "reference": "6288ebbf6fa3ed2b2ff2d69c356fbaaf4f0971a7",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.3"
- },
- "time": "2014-10-07 09:23:16",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Provides functionality to handle HHVM/PHP environments",
- "homepage": "http://www.github.com/sebastianbergmann/environment",
- "keywords": [
- "Xdebug",
- "environment",
- "hhvm"
- ]
- },
{
"name": "sebastian/diff",
"version": "1.2.0",
@@ -1533,42 +1328,27 @@
]
},
{
- "name": "symfony/http-foundation",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/HttpFoundation",
+ "name": "psr/log",
+ "version": "1.0.0",
+ "version_normalized": "1.0.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpFoundation.git",
- "reference": "650e115af152d7a5e857d01c2cdb9a22809de9b4"
+ "url": "https://github.com/php-fig/log",
+ "reference": "1.0.0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/650e115af152d7a5e857d01c2cdb9a22809de9b4",
- "reference": "650e115af152d7a5e857d01c2cdb9a22809de9b4",
+ "url": "https://github.com/php-fig/log/archive/1.0.0.zip",
+ "reference": "1.0.0",
"shasum": ""
},
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/expression-language": "~2.4"
- },
- "time": "2014-09-25 09:52:29",
+ "time": "2012-12-21 11:40:51",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.5-dev"
- }
- },
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\HttpFoundation\\": ""
- },
- "classmap": [
- "Symfony/Component/HttpFoundation/Resources/stubs"
- ]
+ "Psr\\Log\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1576,57 +1356,51 @@
],
"authors": [
{
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "Symfony HttpFoundation Component",
- "homepage": "http://symfony.com"
+ "description": "Common interface for logging libraries",
+ "keywords": [
+ "log",
+ "psr",
+ "psr-3"
+ ]
},
{
- "name": "symfony/event-dispatcher",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/EventDispatcher",
+ "name": "stack/builder",
+ "version": "v1.0.2",
+ "version_normalized": "1.0.2.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "f6281337bf5f985f585d1db6a83adb05ce531f46"
+ "url": "https://github.com/stackphp/builder.git",
+ "reference": "b4af43e7b7f3f7fac919ff475b29f7c5dc7b23b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f6281337bf5f985f585d1db6a83adb05ce531f46",
- "reference": "f6281337bf5f985f585d1db6a83adb05ce531f46",
+ "url": "https://api.github.com/repos/stackphp/builder/zipball/b4af43e7b7f3f7fac919ff475b29f7c5dc7b23b7",
+ "reference": "b4af43e7b7f3f7fac919ff475b29f7c5dc7b23b7",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.0",
+ "symfony/http-foundation": "~2.1",
+ "symfony/http-kernel": "~2.1"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~2.0",
- "symfony/dependency-injection": "~2.0,<2.6.0",
- "symfony/stopwatch": "~2.2"
- },
- "suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "silex/silex": "~1.0"
},
- "time": "2014-09-28 15:56:11",
+ "time": "2014-01-28 19:42:24",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "1.0-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\EventDispatcher\\": ""
+ "Stack": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1635,55 +1409,56 @@
],
"authors": [
{
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch",
+ "homepage": "http://wiedler.ch/igor/"
}
],
- "description": "Symfony EventDispatcher Component",
- "homepage": "http://symfony.com"
+ "description": "Builder for stack middlewares based on HttpKernelInterface.",
+ "keywords": [
+ "stack"
+ ]
},
{
- "name": "symfony/debug",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/Debug",
+ "name": "symfony-cmf/routing",
+ "version": "1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Debug.git",
- "reference": "4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648"
+ "url": "https://github.com/symfony-cmf/Routing.git",
+ "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648",
- "reference": "4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648",
+ "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/8e87981d72c6930a27585dcd3119f3199f6cb2a6",
+ "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "psr/log": "~1.0",
+ "symfony/http-kernel": "~2.2",
+ "symfony/routing": "~2.2"
},
"require-dev": {
- "symfony/http-foundation": "~2.1",
- "symfony/http-kernel": "~2.1"
+ "symfony/config": "~2.2",
+ "symfony/dependency-injection": "~2.0@stable",
+ "symfony/event-dispatcher": "~2.1"
},
"suggest": {
- "symfony/http-foundation": "",
- "symfony/http-kernel": ""
+ "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
},
- "time": "2014-09-28 15:22:14",
+ "time": "2014-10-20 20:55:17",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "1.3-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Debug\\": ""
+ "psr-4": {
+ "Symfony\\Cmf\\Component\\Routing\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1692,38 +1467,249 @@
],
"authors": [
{
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
+ "name": "Symfony CMF Community",
+ "homepage": "https://github.com/symfony-cmf/Routing/contributors"
+ }
+ ],
+ "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
+ "homepage": "http://cmf.symfony.com",
+ "keywords": [
+ "database",
+ "routing"
+ ]
+ },
+ {
+ "name": "twig/twig",
+ "version": "v1.16.2",
+ "version_normalized": "1.16.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/fabpot/Twig.git",
+ "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/fabpot/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
+ "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.2.4"
+ },
+ "time": "2014-10-17 12:53:44",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.16-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Twig_": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Armin Ronacher",
+ "email": "armin.ronacher@active-4.com",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage": "https://github.com/fabpot/Twig/graphs/contributors",
+ "role": "Contributors"
}
],
- "description": "Symfony Debug Component",
- "homepage": "http://symfony.com"
+ "description": "Twig, the flexible, fast, and secure template language for PHP",
+ "homepage": "http://twig.sensiolabs.org",
+ "keywords": [
+ "templating"
+ ]
},
{
- "name": "psr/log",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
+ "name": "zendframework/zend-stdlib",
+ "version": "2.2.6",
+ "version_normalized": "2.2.6.0",
+ "target-dir": "Zend/Stdlib",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/log",
- "reference": "1.0.0"
+ "url": "https://github.com/zendframework/Component_ZendStdlib.git",
+ "reference": "e646729f2274f4552b6a92e38d8e458efe08ebc5"
},
"dist": {
"type": "zip",
- "url": "https://github.com/php-fig/log/archive/1.0.0.zip",
- "reference": "1.0.0",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/e646729f2274f4552b6a92e38d8e458efe08ebc5",
+ "reference": "e646729f2274f4552b6a92e38d8e458efe08ebc5",
"shasum": ""
},
- "time": "2012-12-21 11:40:51",
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+ "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+ },
+ "time": "2014-01-04 13:00:28",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Psr\\Log\\": ""
+ "Zend\\Stdlib\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "stdlib",
+ "zf2"
+ ]
+ },
+ {
+ "name": "zendframework/zend-escaper",
+ "version": "2.2.6",
+ "version_normalized": "2.2.6.0",
+ "target-dir": "Zend/Escaper",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendEscaper.git",
+ "reference": "80abc4bc1f48b9fe8ed603aaa9eebd6e6f30fd0f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/80abc4bc1f48b9fe8ed603aaa9eebd6e6f30fd0f",
+ "reference": "80abc4bc1f48b9fe8ed603aaa9eebd6e6f30fd0f",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2014-01-04 13:00:13",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Zend\\Escaper\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "escaper",
+ "zf2"
+ ]
+ },
+ {
+ "name": "zendframework/zend-feed",
+ "version": "2.2.6",
+ "version_normalized": "2.2.6.0",
+ "target-dir": "Zend/Feed",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendFeed.git",
+ "reference": "8acb562d99dd0786d25c990530980d2d92b67b35"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/8acb562d99dd0786d25c990530980d2d92b67b35",
+ "reference": "8acb562d99dd0786d25c990530980d2d92b67b35",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
+ "zendframework/zend-validator": "Zend\\Validator component"
+ },
+ "time": "2014-01-04 13:00:14",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Zend\\Feed\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides functionality for consuming RSS and Atom feeds",
+ "keywords": [
+ "feed",
+ "zf2"
+ ]
+ },
+ {
+ "name": "guzzlehttp/guzzle",
+ "version": "5.0.3",
+ "version_normalized": "5.0.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/guzzle.git",
+ "reference": "6c72627de1d66832e4270e36e56acdb0d1d8f282"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6c72627de1d66832e4270e36e56acdb0d1d8f282",
+ "reference": "6c72627de1d66832e4270e36e56acdb0d1d8f282",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/ringphp": "~1.0",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "~4.0",
+ "psr/log": "~1.0"
+ },
+ "time": "2014-11-04 07:09:15",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.0-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1732,72 +1718,56 @@
],
"authors": [
{
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
}
],
- "description": "Common interface for logging libraries",
+ "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+ "homepage": "http://guzzlephp.org/",
"keywords": [
- "log",
- "psr",
- "psr-3"
+ "client",
+ "curl",
+ "framework",
+ "http",
+ "http client",
+ "rest",
+ "web service"
]
},
{
- "name": "symfony/http-kernel",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/HttpKernel",
+ "name": "symfony/class-loader",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/ClassLoader",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpKernel.git",
- "reference": "6a3595611229def14d5e644f060cf372235532ec"
+ "url": "https://github.com/symfony/ClassLoader.git",
+ "reference": "d1a16139ea522ec3cc20801b7e19cd3cafd12d8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6a3595611229def14d5e644f060cf372235532ec",
- "reference": "6a3595611229def14d5e644f060cf372235532ec",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/d1a16139ea522ec3cc20801b7e19cd3cafd12d8c",
+ "reference": "d1a16139ea522ec3cc20801b7e19cd3cafd12d8c",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "psr/log": "~1.0",
- "symfony/debug": "~2.5",
- "symfony/event-dispatcher": "~2.5",
- "symfony/http-foundation": "~2.5"
+ "php": ">=5.3.3"
},
"require-dev": {
- "symfony/browser-kit": "~2.2",
- "symfony/class-loader": "~2.1",
- "symfony/config": "~2.0",
- "symfony/console": "~2.2",
- "symfony/dependency-injection": "~2.0",
- "symfony/expression-language": "~2.4",
- "symfony/finder": "~2.0",
- "symfony/process": "~2.0",
- "symfony/routing": "~2.2",
- "symfony/stopwatch": "~2.2",
- "symfony/templating": "~2.2"
- },
- "suggest": {
- "symfony/browser-kit": "",
- "symfony/class-loader": "",
- "symfony/config": "",
- "symfony/console": "",
- "symfony/dependency-injection": "",
- "symfony/finder": ""
+ "symfony/finder": "~2.0"
},
- "time": "2014-09-28 17:33:53",
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\HttpKernel\\": ""
+ "Symfony\\Component\\ClassLoader\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1814,43 +1784,39 @@
"email": "fabien@symfony.com"
}
],
- "description": "Symfony HttpKernel Component",
+ "description": "Symfony ClassLoader Component",
"homepage": "http://symfony.com"
},
{
- "name": "stack/builder",
- "version": "v1.0.2",
- "version_normalized": "1.0.2.0",
+ "name": "symfony/css-selector",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
- "url": "https://github.com/stackphp/builder.git",
- "reference": "b4af43e7b7f3f7fac919ff475b29f7c5dc7b23b7"
+ "url": "https://github.com/symfony/CssSelector.git",
+ "reference": "41953ad30ffc5cd710d106cf01eff79f6effa117"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/stackphp/builder/zipball/b4af43e7b7f3f7fac919ff475b29f7c5dc7b23b7",
- "reference": "b4af43e7b7f3f7fac919ff475b29f7c5dc7b23b7",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/41953ad30ffc5cd710d106cf01eff79f6effa117",
+ "reference": "41953ad30ffc5cd710d106cf01eff79f6effa117",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "symfony/http-foundation": "~2.1",
- "symfony/http-kernel": "~2.1"
- },
- "require-dev": {
- "silex/silex": "~1.0"
+ "php": ">=5.3.3"
},
- "time": "2014-01-28 19:42:24",
+ "time": "2014-10-26 07:46:28",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Stack": "src"
+ "Symfony\\Component\\CssSelector\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1859,60 +1825,61 @@
],
"authors": [
{
- "name": "Igor Wiedler",
- "email": "igor@wiedler.ch",
- "homepage": "http://wiedler.ch/igor/"
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
- "description": "Builder for stack middlewares based on HttpKernelInterface.",
- "keywords": [
- "stack"
- ]
+ "description": "Symfony CssSelector Component",
+ "homepage": "http://symfony.com"
},
{
- "name": "symfony/routing",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/Routing",
+ "name": "symfony/dependency-injection",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Routing.git",
- "reference": "9bc38fe72e0eff61611e7cd4df3accbce20b1d36"
+ "url": "https://github.com/symfony/DependencyInjection.git",
+ "reference": "926500fe0b8a6562c4e8b8166a1cb664733804aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/9bc38fe72e0eff61611e7cd4df3accbce20b1d36",
- "reference": "9bc38fe72e0eff61611e7cd4df3accbce20b1d36",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/926500fe0b8a6562c4e8b8166a1cb664733804aa",
+ "reference": "926500fe0b8a6562c4e8b8166a1cb664733804aa",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "doctrine/annotations": "~1.0",
- "psr/log": "~1.0",
"symfony/config": "~2.2",
"symfony/expression-language": "~2.4",
- "symfony/http-foundation": "~2.3",
"symfony/yaml": "~2.0"
},
"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"
+ "symfony/config": "",
+ "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+ "symfony/yaml": ""
},
- "time": "2014-09-22 15:28:36",
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\Routing\\": ""
+ "Symfony\\Component\\DependencyInjection\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1929,55 +1896,48 @@
"email": "fabien@symfony.com"
}
],
- "description": "Symfony Routing Component",
- "homepage": "http://symfony.com",
- "keywords": [
- "router",
- "routing",
- "uri",
- "url"
- ]
+ "description": "Symfony DependencyInjection Component",
+ "homepage": "http://symfony.com"
},
{
- "name": "symfony-cmf/routing",
- "version": "1.3.0",
- "version_normalized": "1.3.0.0",
+ "name": "symfony/debug",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/Debug",
"source": {
"type": "git",
- "url": "https://github.com/symfony-cmf/Routing.git",
- "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6"
+ "url": "https://github.com/symfony/Debug.git",
+ "reference": "3548595c26175fdaca19cbec204668c22cda41f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/8e87981d72c6930a27585dcd3119f3199f6cb2a6",
- "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/3548595c26175fdaca19cbec204668c22cda41f0",
+ "reference": "3548595c26175fdaca19cbec204668c22cda41f0",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "psr/log": "~1.0",
- "symfony/http-kernel": "~2.2",
- "symfony/routing": "~2.2"
+ "psr/log": "~1.0"
},
"require-dev": {
- "symfony/config": "~2.2",
- "symfony/dependency-injection": "~2.0@stable",
- "symfony/event-dispatcher": "~2.1"
+ "symfony/http-foundation": "~2.1",
+ "symfony/http-kernel": "~2.1"
},
"suggest": {
- "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
+ "symfony/http-foundation": "",
+ "symfony/http-kernel": ""
},
- "time": "2014-10-20 20:55:17",
+ "time": "2014-10-28 10:06:58",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Cmf\\Component\\Routing\\": ""
+ "psr-0": {
+ "Symfony\\Component\\Debug\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1986,51 +1946,54 @@
],
"authors": [
{
- "name": "Symfony CMF Community",
- "homepage": "https://github.com/symfony-cmf/Routing/contributors"
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
- "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
- "homepage": "http://cmf.symfony.com",
- "keywords": [
- "database",
- "routing"
- ]
+ "description": "Symfony Debug Component",
+ "homepage": "http://symfony.com"
},
{
- "name": "symfony/class-loader",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/ClassLoader",
+ "name": "symfony/http-foundation",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/ClassLoader.git",
- "reference": "432561f655123b003b32f370ca812fed9a9340c6"
+ "url": "https://github.com/symfony/HttpFoundation.git",
+ "reference": "4cd6c807598e560db7b3da50c4330fdb4808cfa1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/432561f655123b003b32f370ca812fed9a9340c6",
- "reference": "432561f655123b003b32f370ca812fed9a9340c6",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/4cd6c807598e560db7b3da50c4330fdb4808cfa1",
+ "reference": "4cd6c807598e560db7b3da50c4330fdb4808cfa1",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/finder": "~2.0"
+ "symfony/expression-language": "~2.4"
},
- "time": "2014-09-22 09:14:18",
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\ClassLoader\\": ""
- }
+ "Symfony\\Component\\HttpFoundation\\": ""
+ },
+ "classmap": [
+ "Symfony/Component/HttpFoundation/Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2046,39 +2009,50 @@
"email": "fabien@symfony.com"
}
],
- "description": "Symfony ClassLoader Component",
+ "description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com"
},
{
- "name": "symfony/css-selector",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/CssSelector",
+ "name": "symfony/event-dispatcher",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
- "url": "https://github.com/symfony/CssSelector.git",
- "reference": "caf5ecc3face1f22884fb74b8edab65ac5ba9976"
+ "url": "https://github.com/symfony/EventDispatcher.git",
+ "reference": "dcf345d5ed96bc6c3b4521c1989670d2c9e5014e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/caf5ecc3face1f22884fb74b8edab65ac5ba9976",
- "reference": "caf5ecc3face1f22884fb74b8edab65ac5ba9976",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/dcf345d5ed96bc6c3b4521c1989670d2c9e5014e",
+ "reference": "dcf345d5ed96bc6c3b4521c1989670d2c9e5014e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2014-09-22 09:14:18",
+ "require-dev": {
+ "psr/log": "~1.0",
+ "symfony/config": "~2.0",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
+ "symfony/stopwatch": "~2.2"
+ },
+ "suggest": {
+ "symfony/dependency-injection": "",
+ "symfony/http-kernel": ""
+ },
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\CssSelector\\": ""
+ "Symfony\\Component\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2090,58 +2064,72 @@
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
- {
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
- "description": "Symfony CssSelector Component",
+ "description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com"
},
{
- "name": "symfony/dependency-injection",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/DependencyInjection",
+ "name": "symfony/http-kernel",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
- "url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "1f01a64c9047909e40700a14ee34e8c446300618"
+ "url": "https://github.com/symfony/HttpKernel.git",
+ "reference": "7fa0bd9220cd529ee78d8565bbf8d5a854bd72d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/1f01a64c9047909e40700a14ee34e8c446300618",
- "reference": "1f01a64c9047909e40700a14ee34e8c446300618",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/7fa0bd9220cd529ee78d8565bbf8d5a854bd72d2",
+ "reference": "7fa0bd9220cd529ee78d8565bbf8d5a854bd72d2",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "psr/log": "~1.0",
+ "symfony/debug": "~2.6",
+ "symfony/event-dispatcher": "~2.5",
+ "symfony/http-foundation": "~2.5"
},
"require-dev": {
- "symfony/config": "~2.2",
+ "symfony/browser-kit": "~2.2",
+ "symfony/class-loader": "~2.1",
+ "symfony/config": "~2.0",
+ "symfony/console": "~2.2",
+ "symfony/dependency-injection": "~2.0",
"symfony/expression-language": "~2.4",
- "symfony/yaml": "~2.0"
+ "symfony/finder": "~2.0",
+ "symfony/process": "~2.0",
+ "symfony/routing": "~2.2",
+ "symfony/stopwatch": "~2.2",
+ "symfony/templating": "~2.2",
+ "symfony/translation": "~2.0",
+ "symfony/var-dumper": "~2.6"
},
"suggest": {
+ "symfony/browser-kit": "",
+ "symfony/class-loader": "",
"symfony/config": "",
- "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
- "symfony/yaml": ""
+ "symfony/console": "",
+ "symfony/dependency-injection": "",
+ "symfony/finder": "",
+ "symfony/var-dumper": ""
},
- "time": "2014-09-27 08:35:39",
+ "time": "2014-11-03 20:15:26",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\DependencyInjection\\": ""
+ "Symfony\\Component\\HttpKernel\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2158,39 +2146,53 @@
"email": "fabien@symfony.com"
}
],
- "description": "Symfony DependencyInjection Component",
+ "description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com"
},
{
- "name": "symfony/process",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
- "target-dir": "Symfony/Component/Process",
+ "name": "symfony/routing",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "8a1ec96c4e519cee0fb971ea48a1eb7369dda54b"
+ "url": "https://github.com/symfony/Routing.git",
+ "reference": "f0bb6f818f9a7ece41c7dfe14e08b13c2de55b0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/8a1ec96c4e519cee0fb971ea48a1eb7369dda54b",
- "reference": "8a1ec96c4e519cee0fb971ea48a1eb7369dda54b",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/f0bb6f818f9a7ece41c7dfe14e08b13c2de55b0c",
+ "reference": "f0bb6f818f9a7ece41c7dfe14e08b13c2de55b0c",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2014-09-23 05:25:11",
+ "require-dev": {
+ "doctrine/annotations": "~1.0",
+ "psr/log": "~1.0",
+ "symfony/config": "~2.2",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.3",
+ "symfony/yaml": "~2.0"
+ },
+ "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": "2014-11-03 19:16:49",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\Process\\": ""
+ "Symfony\\Component\\Routing\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2207,33 +2209,39 @@
"email": "fabien@symfony.com"
}
],
- "description": "Symfony Process Component",
- "homepage": "http://symfony.com"
+ "description": "Symfony Routing Component",
+ "homepage": "http://symfony.com",
+ "keywords": [
+ "router",
+ "routing",
+ "uri",
+ "url"
+ ]
},
{
"name": "symfony/serializer",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
"target-dir": "Symfony/Component/Serializer",
"source": {
"type": "git",
"url": "https://github.com/symfony/Serializer.git",
- "reference": "a95c0471682778da2e02169fb2644d3b08d4470f"
+ "reference": "e96b7ac54b3d75a458f76eab11b7cd2d757f09f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/a95c0471682778da2e02169fb2644d3b08d4470f",
- "reference": "a95c0471682778da2e02169fb2644d3b08d4470f",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/e96b7ac54b3d75a458f76eab11b7cd2d757f09f1",
+ "reference": "e96b7ac54b3d75a458f76eab11b7cd2d757f09f1",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2014-09-22 09:14:18",
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
@@ -2261,18 +2269,18 @@
},
{
"name": "symfony/translation",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
+ "version": "v2.5.6",
+ "version_normalized": "2.5.6.0",
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
- "reference": "170c0d895616e1a6a35681ffb0b9e339f58ab928"
+ "reference": "362fe4da2cfe587f72d57aaa2f89e6b61c05dedf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/170c0d895616e1a6a35681ffb0b9e339f58ab928",
- "reference": "170c0d895616e1a6a35681ffb0b9e339f58ab928",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/362fe4da2cfe587f72d57aaa2f89e6b61c05dedf",
+ "reference": "362fe4da2cfe587f72d57aaa2f89e6b61c05dedf",
"shasum": ""
},
"require": {
@@ -2287,7 +2295,7 @@
"symfony/config": "",
"symfony/yaml": ""
},
- "time": "2014-09-23 05:25:11",
+ "time": "2014-10-01 05:50:18",
"type": "library",
"extra": {
"branch-alias": {
@@ -2319,18 +2327,18 @@
},
{
"name": "symfony/validator",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
"target-dir": "Symfony/Component/Validator",
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
- "reference": "64f61505843ca5e6c647244f5a4b6812c1279427"
+ "reference": "6e521cdbc963cef7daf9931a7bde48b56d67d10a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/64f61505843ca5e6c647244f5a4b6812c1279427",
- "reference": "64f61505843ca5e6c647244f5a4b6812c1279427",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/6e521cdbc963cef7daf9931a7bde48b56d67d10a",
+ "reference": "6e521cdbc963cef7daf9931a7bde48b56d67d10a",
"shasum": ""
},
"require": {
@@ -2359,11 +2367,11 @@
"symfony/property-access": "For using the 2.4 Validator API",
"symfony/yaml": ""
},
- "time": "2014-09-28 15:22:14",
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
@@ -2390,237 +2398,196 @@
"homepage": "http://symfony.com"
},
{
- "name": "twig/twig",
- "version": "v1.16.2",
- "version_normalized": "1.16.2.0",
+ "name": "symfony/yaml",
+ "version": "v2.6.0-BETA1",
+ "version_normalized": "2.6.0.0-beta1",
+ "target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
- "url": "https://github.com/fabpot/Twig.git",
- "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "9da3813f36985a4089f7e83c601a1034d125ff69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fabpot/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
- "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/9da3813f36985a4089f7e83c601a1034d125ff69",
+ "reference": "9da3813f36985a4089f7e83c601a1034d125ff69",
"shasum": ""
},
"require": {
- "php": ">=5.2.4"
+ "php": ">=5.3.3"
},
- "time": "2014-10-17 12:53:44",
+ "time": "2014-11-03 03:55:50",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16-dev"
+ "dev-master": "2.6-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Twig_": "lib/"
+ "Symfony\\Component\\Yaml\\": ""
}
},
"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"
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
},
{
- "name": "Twig Team",
- "homepage": "https://github.com/fabpot/Twig/graphs/contributors",
- "role": "Contributors"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
- "description": "Twig, the flexible, fast, and secure template language for PHP",
- "homepage": "http://twig.sensiolabs.org",
- "keywords": [
- "templating"
- ]
+ "description": "Symfony Yaml Component",
+ "homepage": "http://symfony.com"
},
{
- "name": "zendframework/zend-stdlib",
- "version": "2.2.6",
- "version_normalized": "2.2.6.0",
- "target-dir": "Zend/Stdlib",
+ "name": "egulias/email-validator",
+ "version": "1.2.5",
+ "version_normalized": "1.2.5.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/Component_ZendStdlib.git",
- "reference": "e646729f2274f4552b6a92e38d8e458efe08ebc5"
+ "url": "https://github.com/egulias/EmailValidator.git",
+ "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/e646729f2274f4552b6a92e38d8e458efe08ebc5",
- "reference": "e646729f2274f4552b6a92e38d8e458efe08ebc5",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
+ "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "doctrine/lexer": "~1.0",
+ "php": ">= 5.3.3"
},
- "suggest": {
- "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
- "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+ "require-dev": {
+ "satooshi/php-coveralls": "dev-master"
},
- "time": "2014-01-04 13:00:28",
+ "time": "2014-11-06 08:59:44",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "1.3.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Zend\\Stdlib\\": ""
+ "Egulias\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "keywords": [
- "stdlib",
- "zf2"
- ]
- },
- {
- "name": "zendframework/zend-escaper",
- "version": "2.2.6",
- "version_normalized": "2.2.6.0",
- "target-dir": "Zend/Escaper",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/Component_ZendEscaper.git",
- "reference": "80abc4bc1f48b9fe8ed603aaa9eebd6e6f30fd0f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/80abc4bc1f48b9fe8ed603aaa9eebd6e6f30fd0f",
- "reference": "80abc4bc1f48b9fe8ed603aaa9eebd6e6f30fd0f",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2014-01-04 13:00:13",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Zend\\Escaper\\": ""
+ "authors": [
+ {
+ "name": "Eduardo Gulias Davis"
}
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
],
+ "description": "A library for validating emails",
+ "homepage": "https://github.com/egulias/EmailValidator",
"keywords": [
- "escaper",
- "zf2"
+ "email",
+ "validation",
+ "validator"
]
},
{
- "name": "zendframework/zend-feed",
- "version": "2.2.6",
- "version_normalized": "2.2.6.0",
- "target-dir": "Zend/Feed",
+ "name": "sebastian/environment",
+ "version": "1.2.0",
+ "version_normalized": "1.2.0.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/Component_ZendFeed.git",
- "reference": "8acb562d99dd0786d25c990530980d2d92b67b35"
+ "url": "https://github.com/sebastianbergmann/environment.git",
+ "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/8acb562d99dd0786d25c990530980d2d92b67b35",
- "reference": "8acb562d99dd0786d25c990530980d2d92b67b35",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d",
+ "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-stdlib": "self.version"
+ "php": ">=5.3.3"
},
- "suggest": {
- "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
- "zendframework/zend-validator": "Zend\\Validator component"
+ "require-dev": {
+ "phpunit/phpunit": "~4.3"
},
- "time": "2014-01-04 13:00:14",
+ "time": "2014-10-22 06:38:05",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "1.2.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Zend\\Feed\\": ""
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "provides functionality for consuming RSS and Atom feeds",
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Provides functionality to handle HHVM/PHP environments",
+ "homepage": "http://www.github.com/sebastianbergmann/environment",
"keywords": [
- "feed",
- "zf2"
+ "Xdebug",
+ "environment",
+ "hhvm"
]
},
{
- "name": "guzzlehttp/guzzle",
- "version": "5.0.3",
- "version_normalized": "5.0.3.0",
+ "name": "guzzlehttp/ringphp",
+ "version": "1.0.3",
+ "version_normalized": "1.0.3.0",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/guzzle.git",
- "reference": "6c72627de1d66832e4270e36e56acdb0d1d8f282"
+ "url": "https://github.com/guzzle/RingPHP.git",
+ "reference": "e7c28f96c5ac12ab0e63412cfc15989756fcb964"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6c72627de1d66832e4270e36e56acdb0d1d8f282",
- "reference": "6c72627de1d66832e4270e36e56acdb0d1d8f282",
+ "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/e7c28f96c5ac12ab0e63412cfc15989756fcb964",
+ "reference": "e7c28f96c5ac12ab0e63412cfc15989756fcb964",
"shasum": ""
},
"require": {
- "guzzlehttp/ringphp": "~1.0",
- "php": ">=5.4.0"
+ "guzzlehttp/streams": "~3.0",
+ "php": ">=5.4.0",
+ "react/promise": "~2.0"
},
"require-dev": {
"ext-curl": "*",
- "phpunit/phpunit": "~4.0",
- "psr/log": "~1.0"
+ "phpunit/phpunit": "~4.0"
},
- "time": "2014-11-04 07:09:15",
+ "suggest": {
+ "ext-curl": "Guzzle will use specific adapters if cURL is present"
+ },
+ "time": "2014-11-04 07:01:14",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "1.0-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "GuzzleHttp\\": "src/"
+ "GuzzleHttp\\Ring\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2633,17 +2600,6 @@
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
- ],
- "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
- "homepage": "http://guzzlephp.org/",
- "keywords": [
- "client",
- "curl",
- "framework",
- "http",
- "http client",
- "rest",
- "web service"
]
}
]
diff --git a/core/vendor/egulias/email-validator/README.md b/core/vendor/egulias/email-validator/README.md
index 4bfe310397ec2afb5f74bc61fb124d45aa75862e..61ad6cb1e305adcae136992fe6f02d316091c251 100644
--- a/core/vendor/egulias/email-validator/README.md
+++ b/core/vendor/egulias/email-validator/README.md
@@ -1,8 +1,13 @@
-EmailValidator [](https://travis-ci.org/egulias/EmailValidator) [](https://coveralls.io/r/egulias/EmailValidator?branch=master) [](https://insight.sensiolabs.com/projects/b18d473e-bd5a-4d88-a7b2-7aeaee0ebd7b)[](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master)
+EmailValidator [](https://travis-ci.org/egulias/EmailValidator) [](https://coveralls.io/r/egulias/EmailValidator?branch=master) [](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)[](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master)
=============================
##Installation##
-Install via composer. Add to your current compooser.json ```require``` key: ```"egulias/email-validator":"1.0.x-dev" ```
+
+Run the command below to install via Composer
+
+```shell
+composer require egulias/email-validator
+```
##Usage##
@@ -24,7 +29,7 @@ More advanced example (returns detailed diagnostic error codes):
```php
<?php
-use egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\EmailValidator;
$validator = new EmailValidator;
$email = 'dominic@sayers.cc';
@@ -46,6 +51,6 @@ As this is a port from another library and work, here are other people related t
* Josepf Bielawski [@stloyd](http://github.com/stloyd): For its first re-work of Dominic's lib
* Dominic Sayers [@dominicsayers](http://github.com/dominicsayers): The original isemail function
-##Licence##
-Released under the MIT Licence attached with this code.
+##License##
+Released under the MIT License attached with this code.
diff --git a/core/vendor/egulias/email-validator/composer.json b/core/vendor/egulias/email-validator/composer.json
index a9961625fa3b846871b343c357c588643f676e33..c8fb886d4661d88802136072eda562df34602708 100644
--- a/core/vendor/egulias/email-validator/composer.json
+++ b/core/vendor/egulias/email-validator/composer.json
@@ -10,7 +10,7 @@
],
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"require": {
diff --git a/core/vendor/egulias/email-validator/composer.lock b/core/vendor/egulias/email-validator/composer.lock
index e7c1abdf683ab9755166483b9c88a568d4fc43d7..3e5a48535eeff9709acb98abfa9cd00e763a4375 100644
--- a/core/vendor/egulias/email-validator/composer.lock
+++ b/core/vendor/egulias/email-validator/composer.lock
@@ -1,9 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "This file is @generated automatically"
],
- "hash": "cca347a6b95164b1121e034b95f824ec",
+ "hash": "9e9dff0cc08c7292600453e681201e13",
"packages": [
{
"name": "doctrine/lexer",
@@ -61,16 +62,16 @@
"packages-dev": [
{
"name": "guzzle/guzzle",
- "version": "v3.9.1",
+ "version": "v3.9.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle3.git",
- "reference": "92d9934f2fca1da15178c91239576ae26e505e60"
+ "reference": "54991459675c1a2924122afbb0e5609ade581155"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/92d9934f2fca1da15178c91239576ae26e505e60",
- "reference": "92d9934f2fca1da15178c91239576ae26e505e60",
+ "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155",
+ "reference": "54991459675c1a2924122afbb0e5609ade581155",
"shasum": ""
},
"require": {
@@ -114,7 +115,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.8-dev"
+ "dev-master": "3.9-dev"
}
},
"autoload": {
@@ -149,7 +150,7 @@
"rest",
"web service"
],
- "time": "2014-05-07 17:04:22"
+ "time": "2014-08-11 04:32:36"
},
{
"name": "psr/log",
@@ -195,18 +196,18 @@
"source": {
"type": "git",
"url": "https://github.com/satooshi/php-coveralls.git",
- "reference": "b7271847c84d160f5b0aae83e45c225e8ffc96f4"
+ "reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/b7271847c84d160f5b0aae83e45c225e8ffc96f4",
- "reference": "b7271847c84d160f5b0aae83e45c225e8ffc96f4",
+ "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/94389a0ebdb64857d6899b5e0254dffa99e5aa96",
+ "reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-simplexml": "*",
- "guzzle/guzzle": ">=3.0",
+ "guzzle/guzzle": ">=2.7",
"php": ">=5.3",
"psr/log": "1.0.0",
"symfony/config": ">=2.0",
@@ -216,7 +217,7 @@
},
"require-dev": {
"apigen/apigen": "2.8.*@stable",
- "pdepend/pdepend": "dev-master",
+ "pdepend/pdepend": "dev-master as 2.0.0",
"phpmd/phpmd": "dev-master",
"phpunit/php-invoker": ">=1.1.0,<1.2.0",
"phpunit/phpunit": "3.7.*@stable",
@@ -262,21 +263,21 @@
"github",
"test"
],
- "time": "2014-05-14 13:09:37"
+ "time": "2014-07-09 10:45:38"
},
{
"name": "symfony/config",
- "version": "v2.4.5",
+ "version": "v2.5.4",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config.git",
- "reference": "2effc67af6f21a0d267210b72d0b0b691d113528"
+ "reference": "080eabdc256c1d7a3a7cf6296271edb68eb1ab2b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Config/zipball/2effc67af6f21a0d267210b72d0b0b691d113528",
- "reference": "2effc67af6f21a0d267210b72d0b0b691d113528",
+ "url": "https://api.github.com/repos/symfony/Config/zipball/080eabdc256c1d7a3a7cf6296271edb68eb1ab2b",
+ "reference": "080eabdc256c1d7a3a7cf6296271edb68eb1ab2b",
"shasum": ""
},
"require": {
@@ -286,7 +287,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -299,49 +300,49 @@
"MIT"
],
"authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
- "time": "2014-04-22 08:11:06"
+ "time": "2014-08-31 03:22:04"
},
{
"name": "symfony/console",
- "version": "v2.4.5",
+ "version": "v2.5.4",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "24f723436e62598c9dddee2a8573d6992504dc5d"
+ "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/24f723436e62598c9dddee2a8573d6992504dc5d",
- "reference": "24f723436e62598c9dddee2a8573d6992504dc5d",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/748beed2a1e73179c3f5154d33fe6ae100c1aeb1",
+ "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
+ "psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1"
},
"suggest": {
+ "psr/log": "For using the console logger",
"symfony/event-dispatcher": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -354,41 +355,42 @@
"MIT"
],
"authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-05-14 21:48:29"
+ "time": "2014-08-14 16:10:54"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.4.5",
+ "version": "v2.5.4",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "e539602e5455aa086c0e81e604745af7789e4d8a"
+ "reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e539602e5455aa086c0e81e604745af7789e4d8a",
- "reference": "e539602e5455aa086c0e81e604745af7789e4d8a",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
+ "reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/dependency-injection": "~2.0"
+ "psr/log": "~1.0",
+ "symfony/config": "~2.0",
+ "symfony/dependency-injection": "~2.0",
+ "symfony/stopwatch": "~2.2"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -397,7 +399,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -410,34 +412,32 @@
"MIT"
],
"authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2014-04-16 10:34:31"
+ "time": "2014-07-28 13:20:46"
},
{
"name": "symfony/filesystem",
- "version": "v2.4.5",
+ "version": "v2.5.4",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
- "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4"
+ "reference": "a765efd199e02ff4001c115c318e219030be9364"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a3af8294bcce4a7c1b2892363b0c9d8109affad4",
- "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4",
+ "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a765efd199e02ff4001c115c318e219030be9364",
+ "reference": "a765efd199e02ff4001c115c318e219030be9364",
"shasum": ""
},
"require": {
@@ -446,7 +446,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -459,34 +459,32 @@
"MIT"
],
"authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
- "time": "2014-04-16 10:34:31"
+ "time": "2014-09-03 09:00:14"
},
{
"name": "symfony/stopwatch",
- "version": "v2.4.5",
+ "version": "v2.5.4",
"target-dir": "Symfony/Component/Stopwatch",
"source": {
"type": "git",
"url": "https://github.com/symfony/Stopwatch.git",
- "reference": "343bcc0360f2c22f371884b8f6a9fee8d1aa431a"
+ "reference": "22ab4f76cdeefd38b00022a6be5709190a2fd046"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/343bcc0360f2c22f371884b8f6a9fee8d1aa431a",
- "reference": "343bcc0360f2c22f371884b8f6a9fee8d1aa431a",
+ "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/22ab4f76cdeefd38b00022a6be5709190a2fd046",
+ "reference": "22ab4f76cdeefd38b00022a6be5709190a2fd046",
"shasum": ""
},
"require": {
@@ -495,7 +493,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -508,34 +506,32 @@
"MIT"
],
"authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony Stopwatch Component",
"homepage": "http://symfony.com",
- "time": "2014-04-18 20:37:09"
+ "time": "2014-08-14 16:10:54"
},
{
"name": "symfony/yaml",
- "version": "v2.4.5",
+ "version": "v2.5.4",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "fd22bb88c3a6f73c898b39bec185a9e211b06265"
+ "reference": "01a7695bcfb013d0a15c6757e15aae120342986f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/fd22bb88c3a6f73c898b39bec185a9e211b06265",
- "reference": "fd22bb88c3a6f73c898b39bec185a9e211b06265",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/01a7695bcfb013d0a15c6757e15aae120342986f",
+ "reference": "01a7695bcfb013d0a15c6757e15aae120342986f",
"shasum": ""
},
"require": {
@@ -544,7 +540,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -557,20 +553,18 @@
"MIT"
],
"authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-05-12 09:27:48"
+ "time": "2014-08-31 03:22:04"
}
],
"aliases": [
@@ -580,6 +574,7 @@
"stability-flags": {
"satooshi/php-coveralls": 20
},
+ "prefer-stable": false,
"platform": {
"php": ">= 5.3.3"
},
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
index 721190fdd00877556679b7097f8a5181c3cbe012..7056235cd9ffc46d6513e4b47f0a89eecc0deb86 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
@@ -31,10 +31,13 @@ class EmailLexer extends AbstractLexer
const S_SEMICOLON = 275;
const S_OPENQBRACKET = 276;
const S_CLOSEQBRACKET = 277;
+ const S_SLASH = 278;
const S_EMPTY = null;
const GENERIC = 300;
const CRLF = 301;
const INVALID = 302;
+ const ASCII_INVALID_FROM = 127;
+ const ASCII_INVALID_TO = 199;
/**
* US-ASCII visible characters not valid for atext (@link http://tools.ietf.org/html/rfc5322#section-3.2.3)
@@ -52,6 +55,7 @@ class EmailLexer extends AbstractLexer
';' => self::S_SEMICOLON,
'@' => self::S_AT,
'\\' => self::S_BACKSLASH,
+ '/' => self::S_SLASH,
',' => self::S_COMMA,
'.' => self::S_DOT,
'"' => self::S_DQUOTE,
@@ -67,14 +71,31 @@ class EmailLexer extends AbstractLexer
'>' => self::S_GREATERTHAN,
'{' => self::S_OPENQBRACKET,
'}' => self::S_CLOSEQBRACKET,
- '' => self::S_EMPTY
+ '' => self::S_EMPTY,
+ '\0' => self::C_NUL,
);
+ protected $invalidASCII = array(226 => 1,);
+
+ protected $hasInvalidTokens = false;
+
protected $previous;
+ public function reset()
+ {
+ $this->hasInvalidTokens = false;
+ parent::reset();
+ }
+
+ public function hasInvalidTokens()
+ {
+ return $this->hasInvalidTokens;
+ }
+
/**
* @param $type
* @throws \UnexpectedValueException
+ * @return boolean
*/
public function find($type)
{
@@ -100,7 +121,7 @@ public function getPrevious()
/**
* moveNext
*
- * @return mixed
+ * @return boolean
*/
public function moveNext()
{
@@ -112,7 +133,7 @@ public function moveNext()
/**
* Lexical catchable patterns.
*
- * @return array
+ * @return string[]
*/
protected function getCatchablePatterns()
{
@@ -130,7 +151,7 @@ protected function getCatchablePatterns()
/**
* Lexical non-catchable patterns.
*
- * @return array
+ * @return string[]
*/
protected function getNonCatchablePatterns()
{
@@ -146,14 +167,48 @@ protected function getNonCatchablePatterns()
*/
protected function getType(&$value)
{
+
+ if ($this->isNullType($value)) {
+ return self::C_NUL;
+ }
+
if (isset($this->charValue[$value])) {
return $this->charValue[$value];
}
- if (preg_match('/[\x10-\x1F]+/', $value)) {
+ if ($this->isInvalid($value)) {
+ $this->hasInvalidTokens = true;
return self::INVALID;
}
return self::GENERIC;
}
+
+ /**
+ * @param string $value
+ */
+ protected function isNullType($value)
+ {
+ if ($value === "\0") {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * @param string $value
+ */
+ protected function isInvalid($value)
+ {
+ if (preg_match('/[\x10-\x1F]+/', $value)) {
+ return true;
+ }
+
+ if (isset($this->invalidASCII[ord($value)])) {
+ return true;
+ }
+
+ return false;
+ }
}
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
index cfb9ce954d8115ba7c9c3efb783f3daf72e8832b..0c5d15684186ce8412662c61f2543687a9c1ec01 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
@@ -28,6 +28,9 @@ public function __construct(EmailLexer $lexer)
$this->domainPartParser = new DomainPart($this->lexer);
}
+ /**
+ * @param string $str
+ */
public function parse($str)
{
$this->lexer->setInput($str);
@@ -36,6 +39,10 @@ public function parse($str)
throw new \InvalidArgumentException('ERR_NOLOCALPART');
}
+ if ($this->lexer->hasInvalidTokens()) {
+ throw new \InvalidArgumentException('ERR_INVALID_ATEXT');
+ }
+
$this->localPartParser->parse($str);
$this->domainPartParser->parse($str);
@@ -78,6 +85,10 @@ protected function hasAtToken()
return true;
}
+ /**
+ * @param string $localPart
+ * @param string $parsedDomainPart
+ */
protected function addLongEmailWarning($localPart, $parsedDomainPart)
{
if (strlen($localPart . '@' . $parsedDomainPart) > self::EMAIL_MAX_LENGTH) {
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
index 34da6364e0d0ea303df5281599d59357b485b0cc..d047decf20c3ff15316f9330ca2684688ffacad6 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
@@ -2,8 +2,6 @@
namespace Egulias\EmailValidator;
-use Egulias\EmailValidator\Parser\LocalPart;
-
/**
* EmailValidator
*
@@ -97,7 +95,7 @@ public function isValid($email, $checkDNS = false, $strict = false)
return false;
}
- return ($strict) ? (!$this->hasWarnings() && $dns) : true;
+ return !$strict || (!$this->hasWarnings() && $dns);
}
/**
@@ -146,16 +144,9 @@ public function getThreshold()
protected function checkDNS()
{
- $checked = false;
- if (!function_exists('dns_get_record') && (
- in_array(self::DNSWARN_NO_RECORD, $this->warnings) &&
- in_array(self::DNSWARN_NO_MX_RECORD, $this->warnings)
- )) {
- return $checked;
- }
+ $checked = true;
$result = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX');
- $checked = true;
if (!$result) {
$this->warnings[] = self::DNSWARN_NO_RECORD;
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
index d622b947e0f0c668a8d416325978a95b9621c626..33875a4930b10a34ebd4e61c139203f23e86bfa5 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
@@ -23,6 +23,9 @@ public function parse($domainPart)
if ($this->lexer->token['type'] === EmailLexer::S_EMPTY) {
throw new \InvalidArgumentException('ERR_NODOMAIN');
}
+ if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+ throw new \InvalidArgumentException('ERR_DOMAINHYPHENEND');
+ }
if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
$this->warnings[] = EmailValidator::DEPREC_COMMENT;
@@ -103,6 +106,10 @@ protected function doParseDomainPart()
do {
$prev = $this->lexer->getPrevious();
+ if ($this->lexer->token['type'] === EmailLexer::S_SLASH) {
+ throw new \InvalidArgumentException('ERR_DOMAIN_CHAR_NOT_ALLOWED');
+ }
+
if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
$this->parseComments();
$this->lexer->moveNext();
@@ -210,6 +217,9 @@ protected function doParseDomainLiteral()
return $addressLiteral;
}
+ /**
+ * @param string $addressLiteral
+ */
protected function checkIPV4Tag($addressLiteral)
{
$matchesIP = array();
@@ -295,5 +305,4 @@ protected function parseDomainComments()
throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
}
}
-
-}
\ No newline at end of file
+}
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
index 47c7cc6597bc9ce9ad5f6936f3d5710d57403084..4db0ea62a33f28b414c8ddc93b4aa0fbac826c9a 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
@@ -4,6 +4,7 @@
use Egulias\EmailValidator\EmailLexer;
use Egulias\EmailValidator\EmailValidator;
+use \InvalidArgumentException;
class LocalPart extends Parser
@@ -21,8 +22,7 @@ public function parse($localPart)
$closingQuote = $this->checkDQUOTE($closingQuote);
if ($closingQuote && $parseDQuote) {
- $this->parseDoubleQuote();
- $parseDQuote = false;
+ $parseDQuote = $this->parseDoubleQuote();
}
if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
@@ -56,23 +56,51 @@ public function parse($localPart)
protected function parseDoubleQuote()
{
- $special = array (
+ $parseAgain = true;
+ $special = array(
EmailLexer::S_CR => true,
EmailLexer::S_HTAB => true,
EmailLexer::S_LF => true
);
+
+ $invalid = array(
+ EmailLexer::C_NUL => true,
+ EmailLexer::S_HTAB => true,
+ EmailLexer::S_CR => true,
+ EmailLexer::S_LF => true
+ );
$setSpecialsWarning = true;
$this->lexer->moveNext();
+
while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && $this->lexer->token) {
+ $parseAgain = false;
if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
$this->warnings[] = EmailValidator::CFWS_FWS;
$setSpecialsWarning = false;
}
+
$this->lexer->moveNext();
+
+ if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
+ throw new InvalidArgumentException("ERR_EXPECTED_ATEXT");
+ }
}
- }
+ $prev = $this->lexer->getPrevious();
+
+ if ($prev['type'] === EmailLexer::S_BACKSLASH) {
+ if (!$this->checkDQUOTE(false)) {
+ throw new \InvalidArgumentException("ERR_UNCLOSED_DQUOTE");
+ }
+ }
+
+ if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
+ throw new \InvalidArgumentException("ERR_EXPECED_AT");
+ }
+
+ return $parseAgain;
+ }
protected function isInvalidToken($token, $closingQuote)
{
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
index b62b4055b80aeb2aee89382d532d4a697c86e76e..b66279e299a749b9a666df77df629b6729f3c619 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
@@ -124,8 +124,7 @@ protected function escaped()
if ($previous['type'] === EmailLexer::S_BACKSLASH
&&
- ($this->lexer->token['type'] === EmailLexer::S_SP ||
- $this->lexer->token['type'] === EmailLexer::S_HTAB)
+ $this->lexer->token['type'] !== EmailLexer::GENERIC
) {
return true;
}
@@ -164,6 +163,7 @@ protected function checkDQUOTE($hasClosingQuote)
if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
}
+
$this->warnings[] = EmailValidator::RFC5321_QUOTEDSTRING;
try {
$this->lexer->find(EmailLexer::S_DQUOTE);
@@ -187,4 +187,4 @@ protected function checkCRLFInFWS()
throw new \InvalidArgumentException("ERR_FWS_CRLF_END");
}
}
-}
\ No newline at end of file
+}
diff --git a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
index 5ee3f3e0a8eda8780b76438c4d067571941412dd..4af771cf1213eb4649bc984aecd653057dabacbc 100644
--- a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
+++ b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
@@ -44,6 +44,15 @@ public function testLexerSearchToken()
$this->assertTrue($lexer->find(EmailLexer::S_HTAB));
}
+ public function testLexerHasInvalidTokens()
+ {
+ $lexer = new EmailLexer();
+ $lexer->setInput(chr(226));
+ $lexer->moveNext();
+ $lexer->moveNext();
+ $this->assertTrue($lexer->hasInvalidTokens());
+ }
+
public function getTokens()
{
return array(
@@ -61,6 +70,7 @@ public function getTokens()
array("\"", EmailLexer::S_DQUOTE),
array("-", EmailLexer::S_HYPHEN),
array("\\", EmailLexer::S_BACKSLASH),
+ array("/", EmailLexer::S_SLASH),
array("(", EmailLexer::S_OPENPARENTHESIS),
array(")", EmailLexer::S_CLOSEPARENTHESIS),
array('<', EmailLexer::S_LOWERTHAN),
@@ -74,7 +84,9 @@ public function getTokens()
array('{', EmailLexer::S_OPENQBRACKET),
array('}', EmailLexer::S_CLOSEQBRACKET),
array('', EmailLexer::S_EMPTY),
- array(chr(31), EmailLexer::INVALID)
+ array(chr(31), EmailLexer::INVALID),
+ array(chr(226), EmailLexer::INVALID),
+ array(chr(0), EmailLexer::C_NUL)
);
}
}
diff --git a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
index 81fcf4dff056786a2a387aea0c2770d13f23f319..e72fde4dd7fef07479c21d99f0857357e90fa203 100644
--- a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
+++ b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
@@ -43,6 +43,10 @@ public function getValidEmails()
array('"user,name"@example.com'),
array('"user name"@example.com'),
array('"user@name"@example.com'),
+ array('"\a"@iana.org'),
+ array('"test\ test"@iana.org'),
+ array('""@iana.org'),
+ array('"\""@iana.org'),
);
}
@@ -57,9 +61,10 @@ public function testInvalidEmails($email)
public function getInvalidEmails()
{
return array(
+
array('example.@example.co.uk'),
array('example@example@example.co.uk'),
- array('(fabien_potencier@example.fr)'),
+ array('(test_exampel@example.fr)'),
array('example(example)example@example.co.uk'),
array('.example@localhost'),
array('ex\ample@localhost'),
@@ -72,6 +77,27 @@ public function getInvalidEmails()
array('username@example,com'),
array('usern,ame@example.com'),
array('user[na]me@example.com'),
+ array('"""@iana.org'),
+ array('"\"@iana.org'),
+ array('"test"test@iana.org'),
+ array('"test""test"@iana.org'),
+ array('"test"."test"@iana.org'),
+ array('"test".test@iana.org'),
+ array('"test"' . chr(0) . '@iana.org'),
+ array('"test\"@iana.org'),
+ array(chr(226) . '@iana.org'),
+ array('test@' . chr(226) . '.org'),
+ array('\r\ntest@iana.org'),
+ array('\r\n test@iana.org'),
+ array('\r\n \r\ntest@iana.org'),
+ array('\r\n \r\ntest@iana.org'),
+ array('\r\n \r\n test@iana.org'),
+ array('test@iana.org \r\n'),
+ array('test@iana.org \r\n '),
+ array('test@iana.org \r\n \r\n'),
+ array('test@iana.org \r\n\r\n'),
+ array('test@iana.org \r\n\r\n '),
+ array('test@iana/icann.org'),
);
}
@@ -124,6 +150,16 @@ public function testValidEmailsWithWarningsCheck($warnings, $email)
$this->assertEquals($warnings, $this->validator->getWarnings());
}
+ /**
+ * @dataProvider getInvalidEmailsWithWarnings
+ */
+ public function testInvalidEmailsWithDnsCheckAndStrictMode($warnings, $email)
+ {
+ $this->assertFalse($this->validator->isValid($email, true, true));
+
+ $this->assertEquals($warnings, $this->validator->getWarnings());
+ }
+
public function getInvalidEmailsWithWarnings()
{
return array(
@@ -275,6 +311,17 @@ public function getInvalidEmailsWithWarnings()
'parttoolonglocalparttoolonglocalparttoolonglocalparttoolonglocalparttoolonglocalparttoolonglocalpart'.
'toolonglocalparttoolonglocalparttoolonglocalparttoolonglocalpar'
),
+ array(
+ array(
+ EmailValidator::DNSWARN_NO_RECORD,
+ ),
+ 'test@test'
+ ),
);
}
+
+ public function testInvalidEmailsWithStrict()
+ {
+ $this->assertFalse($this->validator->isValid('"test"@test', false, true));
+ }
}
diff --git a/core/vendor/guzzlehttp/ringphp/CHANGELOG.md b/core/vendor/guzzlehttp/ringphp/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..ee3ce796e3a5cb84e83a05ef1d8e93d7fd36326c
--- /dev/null
+++ b/core/vendor/guzzlehttp/ringphp/CHANGELOG.md
@@ -0,0 +1,22 @@
+# CHANGELOG
+
+## 1.0.3 - 2014-11-03
+
+* Setting the `header` stream option as a string to be compatible with GAE.
+* Header parsing now ensures that header order is maintained in the parsed
+ message.
+
+## 1.0.2 - 2014-10-28
+
+* Now correctly honoring a `version` option is supplied in a request.
+ See https://github.com/guzzle/RingPHP/pull/8
+
+## 1.0.1 - 2014-10-26
+
+* Fixed a header parsing issue with the `CurlHandler` and `CurlMultiHandler`
+ that caused cURL requests with multiple responses to merge repsonses together
+ (e.g., requests with digest authentication).
+
+## 1.0.0 - 2014-10-12
+
+* Initial release.
diff --git a/core/vendor/guzzlehttp/ringphp/README.rst b/core/vendor/guzzlehttp/ringphp/README.rst
index 1f7a0bc314d213176e64c32833f58f377b288871..10374e813b1f31b2657a9d12e392b8ccd1d2e84c 100644
--- a/core/vendor/guzzlehttp/ringphp/README.rst
+++ b/core/vendor/guzzlehttp/ringphp/README.rst
@@ -2,13 +2,45 @@
RingPHP
=======
-Provides low level APIs used to power HTTP clients and servers through a
-simple, PHP ``callable`` that accepts a request hash and returns a future
-response hash. RingPHP supports both synchronous and asynchronous
-workflows by utilizing both futures and `promises <https://github.com/reactphp/promise>`_.
+Provides a simple API and specification that abstracts away the details of HTTP
+into a single PHP function. RingPHP be used to power HTTP clients and servers
+through a PHP function that accepts a request hash and returns a response hash
+that is fulfilled using a `promise <https://github.com/reactphp/promise>`_,
+allowing RingPHP to support both synchronous and asynchronous workflows.
+
+By abstracting the implementation details of different HTTP clients and
+servers, RingPHP allows you to utilize pluggable HTTP clients and servers
+without tying your application to a specific implementation.
+
+.. code-block:: php
+
+ <?php
+ require 'vendor/autoload.php';
+
+ use GuzzleHttp\Ring\Client\CurlHandler;
+
+ $handler = new CurlHandler();
+ $response = $handler([
+ 'http_method' => 'GET',
+ 'uri' => '/',
+ 'headers' => [
+ 'host' => ['www.google.com'],
+ 'x-foo' => ['baz']
+ ]
+ ]);
+
+ $response->then(function (array $response) {
+ echo $response['status'];
+ });
+
+ $response->wait();
RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
-but has been modified to accommodate clients and servers for both blocking
-and non-blocking requests.
+which, in turn, was inspired by Python's WSGI and Ruby's Rack. RingPHP is
+utilized as the handler layer in `Guzzle <http://guzzlephp.org>`_ 5.0+ to send
+HTTP requests.
+
+Documentation
+-------------
-See http://guzzle-ring.readthedocs.org/ for the full online documentation.
+See http://ringphp.readthedocs.org/ for the full online documentation.
diff --git a/core/vendor/guzzlehttp/ringphp/docs/index.rst b/core/vendor/guzzlehttp/ringphp/docs/index.rst
index 892a50e2209acdf2106b125cb40bba09a4e56426..3ac5447963638898ac90926a0a65d09ad53733fd 100644
--- a/core/vendor/guzzlehttp/ringphp/docs/index.rst
+++ b/core/vendor/guzzlehttp/ringphp/docs/index.rst
@@ -2,23 +2,49 @@
RingPHP
=======
-Provides low level APIs used to power HTTP clients and servers through a
-simple, PHP ``callable`` that accepts a request hash and returns a future
-response hash. RingPHP supports both synchronous and asynchronous
-workflows by utilizing both futures and `promises <https://github.com/reactphp/promise>`_.
+Provides a simple API and specification that abstracts away the details of HTTP
+into a single PHP function. RingPHP be used to power HTTP clients and servers
+through a PHP function that accepts a request hash and returns a response hash
+that is fulfilled using a `promise <https://github.com/reactphp/promise>`_,
+allowing RingPHP to support both synchronous and asynchronous workflows.
-RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
-but has been modified to accommodate clients and servers for both blocking
-and non-blocking requests.
-
-RingPHP is utilized as the handler layer in
-`Guzzle <http://guzzlephp.org>`_ 5.0+ to send HTTP requests.
+By abstracting the implementation details of different HTTP clients and
+servers, RingPHP allows you to utilize pluggable HTTP clients and servers
+without tying your application to a specific implementation.
.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
+
+ spec
+ futures
+ client_middleware
+ client_handlers
+ testing
+
+.. code-block:: php
+
+ <?php
+ require 'vendor/autoload.php';
- spec
- futures
- client_middleware
- client_handlers
- testing
+ use GuzzleHttp\Ring\Client\CurlHandler;
+
+ $handler = new CurlHandler();
+ $response = $handler([
+ 'http_method' => 'GET',
+ 'uri' => '/',
+ 'headers' => [
+ 'host' => ['www.google.com'],
+ 'x-foo' => ['baz']
+ ]
+ ]);
+
+ $response->then(function (array $response) {
+ echo $response['status'];
+ });
+
+ $response->wait();
+
+RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
+which, in turn, was inspired by Python's WSGI and Ruby's Rack. RingPHP is
+utilized as the handler layer in `Guzzle <http://guzzlephp.org>`_ 5.0+ to send
+HTTP requests.
diff --git a/core/vendor/guzzlehttp/ringphp/docs/spec.rst b/core/vendor/guzzlehttp/ringphp/docs/spec.rst
index a8cdffad3eeb1e69267150d2a8ac6673980327d8..bc9107898f4a19e53a760c74259a95960218ebcf 100644
--- a/core/vendor/guzzlehttp/ringphp/docs/spec.rst
+++ b/core/vendor/guzzlehttp/ringphp/docs/spec.rst
@@ -8,7 +8,7 @@ middleware.
Handlers
--------
-Handlers are implemented as a PHP ``callable`` that accept a request array and
+Handlers are implemented as a PHP ``callable`` that accept a request array
and return a response array (``GuzzleHttp\Ring\Future\FutureArrayInterface``).
For example:
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php b/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
index 22d9f5cccaececcc5e54990e702024f61882ddf8..f535a3db13179b8fed32723e2f770bce7db15a8e 100644
--- a/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
+++ b/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
@@ -76,20 +76,17 @@ public static function createResponse(
$response['effective_url'] = $response['transfer_stats']['url'];
}
- if (isset($headers[0])) {
+ if (!empty($headers)) {
$startLine = explode(' ', array_shift($headers), 3);
- // Trim out 100-Continue start-lines
- if ($startLine[1] == '100') {
- $startLine = explode(' ', array_shift($headers), 3);
- }
- $response['headers'] = Core::headersFromLines($headers);
+ $headerList = Core::headersFromLines($headers);
+ $response['headers'] = $headerList;
$response['status'] = isset($startLine[1]) ? (int) $startLine[1] : null;
$response['reason'] = isset($startLine[2]) ? $startLine[2] : null;
$response['body'] = $body;
Core::rewindBody($response);
}
- return !empty($response['curl']['errno']) || !isset($startLine[1])
+ return !empty($response['curl']['errno']) || !isset($response['status'])
? self::createErrorResponse($handler, $request, $response)
: $response;
}
@@ -159,6 +156,7 @@ private function getOutputBody(array $request, array &$options)
private function getDefaultOptions(array $request, array &$headers)
{
$url = Core::url($request);
+ $startingResponse = false;
$options = [
'_headers' => $request['headers'],
@@ -167,15 +165,24 @@ private function getDefaultOptions(array $request, array &$headers)
CURLOPT_RETURNTRANSFER => false,
CURLOPT_HEADER => false,
CURLOPT_CONNECTTIMEOUT => 150,
- CURLOPT_HEADERFUNCTION => function ($ch, $h) use (&$headers) {
- $length = strlen($h);
- if ($value = trim($h)) {
- $headers[] = trim($h);
+ CURLOPT_HEADERFUNCTION => function ($ch, $h) use (&$headers, &$startingResponse) {
+ $value = trim($h);
+ if ($value === '') {
+ $startingResponse = true;
+ } elseif ($startingResponse) {
+ $startingResponse = false;
+ $headers = [$value];
+ } else {
+ $headers[] = $value;
}
- return $length;
+ return strlen($h);
},
];
+ if (isset($request['version'])) {
+ $options[CURLOPT_HTTP_VERSION] = $request['version'] == 1.1 ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
+ }
+
if (defined('CURLOPT_PROTOCOLS')) {
$options[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php b/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
index 905b2b6d6664cde65413c243e69bcf2ff3b16843..3a18ec6b89d247ebbf139969262d0bc168f6f287 100644
--- a/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
+++ b/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
@@ -214,10 +214,10 @@ private function createStream(
private function getDefaultOptions(array $request)
{
- $headers = [];
+ $headers = "";
foreach ($request['headers'] as $name => $value) {
foreach ((array) $value as $val) {
- $headers[] = "$name: $val";
+ $headers .= "$name: $val\r\n";
}
}
@@ -225,7 +225,7 @@ private function getDefaultOptions(array $request)
'http' => [
'method' => $request['http_method'],
'header' => $headers,
- 'protocol_version' => '1.1',
+ 'protocol_version' => isset($request['version']) ? $request['version'] : 1.1,
'ignore_errors' => true,
'follow_location' => 0,
],
@@ -236,10 +236,12 @@ private function getDefaultOptions(array $request)
$context['http']['content'] = $body;
// Prevent the HTTP handler from adding a Content-Type header.
if (!Core::hasHeader($request, 'Content-Type')) {
- $context['http']['header'][] .= "Content-Type:";
+ $context['http']['header'] .= "Content-Type:\r\n";
}
}
+ $context['http']['header'] = rtrim($context['http']['header']);
+
return $context;
}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Core.php b/core/vendor/guzzlehttp/ringphp/src/Core.php
index 112d755bd3fdd55df4ff2332dc04f7ecba510361..dd7d1a0c5a7f6ccab0e496e8774358aed785556f 100644
--- a/core/vendor/guzzlehttp/ringphp/src/Core.php
+++ b/core/vendor/guzzlehttp/ringphp/src/Core.php
@@ -41,24 +41,17 @@ public static function callArray(array $functions)
*/
public static function headerLines($message, $header)
{
- // Slight optimization for exact matches.
- if (isset($message['headers'][$header])) {
- return $message['headers'][$header];
- }
-
- // Check for message with no headers after the "fast" isset check.
- if (!isset($message['headers'])) {
- return [];
- }
+ $result = [];
- // Iterate and case-insensitively find the header by name.
- foreach ($message['headers'] as $name => $value) {
- if (!strcasecmp($name, $header)) {
- return $value;
+ if (!empty($message['headers'])) {
+ foreach ($message['headers'] as $name => $value) {
+ if (!strcasecmp($name, $header)) {
+ $result = array_merge($result, $value);
+ }
}
}
- return [];
+ return $result;
}
/**
@@ -91,18 +84,17 @@ public static function header($message, $header)
*/
public static function firstHeader($message, $header)
{
- $match = self::headerLines($message, $header);
-
- if (!isset($match[0])) {
- return null;
- }
-
- // Return the match itself if it is a single value.
- if (!($pos = strpos($match[0], ','))) {
- return $match[0];
+ if (!empty($message['headers'])) {
+ foreach ($message['headers'] as $name => $value) {
+ if (!strcasecmp($name, $header)) {
+ // Return the match itself if it is a single value.
+ $pos = strpos($value[0], ',');
+ return $pos ? substr($value[0], 0, $pos) : $value[0];
+ }
+ }
}
- return substr($match[0], 0, $pos);
+ return null;
}
/**
@@ -115,7 +107,15 @@ public static function firstHeader($message, $header)
*/
public static function hasHeader($message, $header)
{
- return (bool) self::headerLines($message, $header);
+ if (!empty($message['headers'])) {
+ foreach ($message['headers'] as $name => $value) {
+ if (!strcasecmp($name, $header)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
}
/**
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php b/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
index 0d15ed7c9550b93bb1a4e913daac2bd1e433e2f6..e6a7ca77c3d9f406006ff2bbbc7849aeb78fde48 100644
--- a/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
+++ b/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
@@ -28,9 +28,7 @@ trait BaseFutureTrait
private $isRealized = false;
/**
- * @param PromiseInterface $promise Promise to shadow with the future. Only
- * supply if the promise is not owned
- * by the deferred value.
+ * @param PromiseInterface $promise Promise to shadow with the future.
* @param callable $wait Function that blocks until the deferred
* computation has been resolved. This
* function MUST resolve the deferred value
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php
index 055e43a3a40ecc0e1e86660c777ed875b4c1cc8e..0f787c931b0fb25d8bd35499e7952b3ab2c6d70b 100644
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php
+++ b/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php
@@ -404,6 +404,19 @@ public function testDoesNotForceDecode()
$this->assertEquals($content, Core::body($response));
}
+ public function testProtocolVersion()
+ {
+ Server::flush();
+ Server::enqueue([['status' => 200]]);
+ $a = new CurlMultiHandler();
+ $a([
+ 'http_method' => 'GET',
+ 'headers' => ['host' => [Server::$host]],
+ 'version' => 1.0,
+ ]);
+ $this->assertEquals(CURL_HTTP_VERSION_1_0, $_SERVER['_curl'][CURLOPT_HTTP_VERSION]);
+ }
+
/**
* @expectedException \InvalidArgumentException
*/
@@ -570,7 +583,7 @@ public function testDoesNotAddMultipleContentLengthHeaders()
'http_method' => 'GET',
'headers' => [
'host' => [Server::$host],
- 'content-length' => 3,
+ 'content-length' => [3],
],
'body' => 'foo',
]);
@@ -709,6 +722,71 @@ function () {},
);
$this->assertInstanceOf('GuzzleHttp\Ring\Exception\ConnectException', $response['error']);
}
+
+ public function testParsesLastResponseOnly()
+ {
+ $response1 = [
+ 'status' => 301,
+ 'headers' => [
+ 'Content-Length' => ['0'],
+ 'Location' => ['/foo']
+ ]
+ ];
+
+ $response2 = [
+ 'status' => 200,
+ 'headers' => [
+ 'Content-Length' => ['0'],
+ 'Foo' => ['bar']
+ ]
+ ];
+
+ Server::flush();
+ Server::enqueue([$response1, $response2]);
+
+ $a = new CurlMultiHandler();
+ $response = $a([
+ 'http_method' => 'GET',
+ 'headers' => ['Host' => [Server::$host]],
+ 'client' => [
+ 'curl' => [
+ CURLOPT_FOLLOWLOCATION => true
+ ]
+ ]
+ ])->wait();
+
+ $this->assertEquals(1, $response['transfer_stats']['redirect_count']);
+ $this->assertEquals('http://127.0.0.1:8125/foo', $response['effective_url']);
+ $this->assertEquals(['bar'], $response['headers']['Foo']);
+ $this->assertEquals(200, $response['status']);
+ $this->assertFalse(Core::hasHeader($response, 'Location'));
+ }
+
+ public function testMaintainsMultiHeaderOrder()
+ {
+ Server::flush();
+ Server::enqueue([
+ [
+ 'status' => 200,
+ 'headers' => [
+ 'Content-Length' => ['0'],
+ 'Foo' => ['a', 'b'],
+ 'foo' => ['c', 'd'],
+ ]
+ ]
+ ]);
+
+ $a = new CurlMultiHandler();
+ $response = $a([
+ 'http_method' => 'GET',
+ 'headers' => ['Host' => [Server::$host]]
+ ])->wait();
+
+ $this->assertEquals(
+ ['a', 'b', 'c', 'd'],
+ Core::headerLines($response, 'Foo')
+ );
+ }
}
}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php
index 98ff7e7239aa0de4d1bc8bba39337db681bfc2b0..8f63e29558d9edccbfb0d6066d96ced67693aef3 100644
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php
+++ b/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php
@@ -202,6 +202,20 @@ public function testDoesNotForceGzipDecode()
$this->assertSame($content, Core::body($response));
}
+ public function testProtocolVersion()
+ {
+ $this->queueRes();
+ $handler = new StreamHandler();
+ $handler([
+ 'http_method' => 'GET',
+ 'uri' => '/',
+ 'headers' => ['host' => [Server::$host]],
+ 'version' => 1.0,
+ ]);
+
+ $this->assertEquals(1.0, Server::received()[0]['version']);
+ }
+
protected function getSendResult(array $opts)
{
$this->queueRes();
diff --git a/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php b/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php
index 240fb69f3e8499270794b320bba1668f339ecc59..49522f26b7e851c393d98878db9d4b5bfcd33023 100644
--- a/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php
+++ b/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php
@@ -15,6 +15,22 @@ public function testReturnsNullNoHeadersAreSet()
$this->assertNull(Core::firstHeader([], 'Foo'));
}
+ public function testChecksIfHasHeader()
+ {
+ $message = [
+ 'headers' => [
+ 'Foo' => ['Bar', 'Baz'],
+ 'foo' => ['hello'],
+ 'bar' => ['1']
+ ]
+ ];
+ $this->assertTrue(Core::hasHeader($message, 'Foo'));
+ $this->assertTrue(Core::hasHeader($message, 'foo'));
+ $this->assertTrue(Core::hasHeader($message, 'FoO'));
+ $this->assertTrue(Core::hasHeader($message, 'bar'));
+ $this->assertFalse(Core::hasHeader($message, 'barr'));
+ }
+
public function testReturnsFirstHeaderWhenSimple()
{
$this->assertEquals('Bar', Core::firstHeader([
@@ -37,6 +53,19 @@ public function testExtractsCaseInsensitiveHeader()
);
}
+ public function testExtractsCaseInsensitiveHeaderLines()
+ {
+ $this->assertEquals(
+ ['a', 'b', 'c', 'd'],
+ Core::headerLines([
+ 'headers' => [
+ 'foo' => ['a', 'b'],
+ 'Foo' => ['c', 'd']
+ ]
+ ], 'foo')
+ );
+ }
+
public function testExtractsHeaderLines()
{
$this->assertEquals(
diff --git a/core/vendor/sebastian/environment/composer.json b/core/vendor/sebastian/environment/composer.json
index 3625eca10cdbbfb16c597ba5f2965a1230ad94ac..15d81887b73690fc410b2470460ea2c0baf0641b 100644
--- a/core/vendor/sebastian/environment/composer.json
+++ b/core/vendor/sebastian/environment/composer.json
@@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.2.x-dev"
}
}
}
diff --git a/core/vendor/sebastian/environment/src/Console.php b/core/vendor/sebastian/environment/src/Console.php
index 38b3ba044b7c8a564dc38d77c8bc96f79dc05f8c..3c7b7f9ebfb1e8b6f1a4f468b70f68e780dd8a29 100644
--- a/core/vendor/sebastian/environment/src/Console.php
+++ b/core/vendor/sebastian/environment/src/Console.php
@@ -68,4 +68,28 @@ public function hasColorSupport()
return function_exists('posix_isatty') && @posix_isatty(STDOUT);
}
+
+ /**
+ * Returns the number of columns of the terminal.
+ *
+ * @return integer
+ */
+ public function getNumberOfColumns()
+ {
+ // Windows terminals have a fixed size of 80
+ // but one column is used for the cursor.
+ if (DIRECTORY_SEPARATOR == '\\') {
+ return 79;
+ }
+
+ if (preg_match('#\d+ (\d+)#', shell_exec('stty size'), $match) === 1) {
+ return (int) $match[1];
+ }
+
+ if (preg_match('#columns = (\d+);#', shell_exec('stty'), $match) === 1) {
+ return (int) $match[1];
+ }
+
+ return 80;
+ }
}
diff --git a/core/vendor/sebastian/environment/tests/ConsoleTest.php b/core/vendor/sebastian/environment/tests/ConsoleTest.php
index 0ac7a0b7dba74317b956e2d802064af17e7c8a4e..cb80a62c354919c94bf7eb60c7f20ce4a3b1d94f 100644
--- a/core/vendor/sebastian/environment/tests/ConsoleTest.php
+++ b/core/vendor/sebastian/environment/tests/ConsoleTest.php
@@ -62,6 +62,14 @@ protected function setUp()
*/
public function testCanDetectColorSupport()
{
- $this->assertTrue($this->console->hasColorSupport());
+ $this->assertInternalType('boolean', $this->console->hasColorSupport());
+ }
+
+ /**
+ * @covers \SebastianBergmann\Environment\Console::hasColorSupport
+ */
+ public function testCanDetectNumberOfColumns()
+ {
+ $this->assertInternalType('integer', $this->console->getNumberOfColumns());
}
}
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
index 023f7ba1a62e5c1a16ffb27a7d31de9227bb1087..4fdf39b222d2316584ebdf02b9c8015e80cfa4df 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
@@ -37,8 +37,8 @@
* // register classes with namespaces
* $loader->registerNamespaces(array(
* 'Symfony\Component' => __DIR__.'/component',
- * 'Symfony' => __DIR__.'/framework',
- * 'Sensio' => array(__DIR__.'/src', __DIR__.'/vendor'),
+ * 'Symfony' => __DIR__.'/framework',
+ * 'Sensio' => array(__DIR__.'/src', __DIR__.'/vendor'),
* ));
*
* // register a library using the PEAR naming convention
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php
index 1a5e3554354106e3fd7ade5bf19e9f83a7c08291..b00f7da17f23572fd97204a0e49bbe87a9e6aa61 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php
@@ -107,7 +107,7 @@ public function addPrefix($prefix, $paths)
*/
public function setUseIncludePath($useIncludePath)
{
- $this->useIncludePath = $useIncludePath;
+ $this->useIncludePath = (bool) $useIncludePath;
}
/**
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
index efc95ec8be94c2ca4761a78a7422a8f17e5116b8..6b618cbe6328733fbe3d3633073bee75054467d0 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -86,7 +86,7 @@ public static function createMap($dir)
private static function findClasses($path)
{
$contents = file_get_contents($path);
- $tokens = token_get_all($contents);
+ $tokens = token_get_all($contents);
$classes = array();
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
index fc222b1c9e3988a6c0753af83644b50905b53836..d673688551dde459c89164742116de26578e5ab8 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
@@ -9,51 +9,63 @@ standard or the PEAR naming convention.
First, register the autoloader:
- require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+```php
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
- use Symfony\Component\ClassLoader\UniversalClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
- $loader = new UniversalClassLoader();
- $loader->register();
+$loader = new UniversalClassLoader();
+$loader->register();
+```
Then, register some namespaces with the `registerNamespace()` method:
- $loader->registerNamespace('Symfony', __DIR__.'/src');
- $loader->registerNamespace('Monolog', __DIR__.'/vendor/monolog/src');
+```php
+$loader->registerNamespace('Symfony', __DIR__.'/src');
+$loader->registerNamespace('Monolog', __DIR__.'/vendor/monolog/src');
+```
The `registerNamespace()` method takes a namespace prefix and a path where to
look for the classes as arguments.
You can also register a sub-namespaces:
- $loader->registerNamespace('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
+```php
+$loader->registerNamespace('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
+```
The order of registration is significant and the first registered namespace
takes precedence over later registered one.
You can also register more than one path for a given namespace:
- $loader->registerNamespace('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
+```php
+$loader->registerNamespace('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
+```
Alternatively, you can use the `registerNamespaces()` method to register more
than one namespace at once:
- $loader->registerNamespaces(array(
- 'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'),
- 'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
- 'Doctrine' => __DIR__.'/vendor/doctrine/lib',
- 'Monolog' => __DIR__.'/vendor/monolog/src',
- ));
+```php
+$loader->registerNamespaces(array(
+ 'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'),
+ 'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
+ 'Doctrine' => __DIR__.'/vendor/doctrine/lib',
+ 'Monolog' => __DIR__.'/vendor/monolog/src',
+));
+```
For better performance, you can use the APC based version of the universal
class loader:
- require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
- require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
+```php
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
- use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
+use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
- $loader = new ApcUniversalClassLoader('apc.prefix.');
+$loader = new ApcUniversalClassLoader('apc.prefix.');
+```
Furthermore, the component provides tools to aggregate classes into a single
file, which is especially useful to improve performance on servers that do not
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
index 35617e363ea481fb0ba81feb6526a9cc5edc4303..be2385ed9726735be16234df288cff3928bf0452 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -72,9 +72,9 @@ public function getTestCreateMapTests()
{
$data = array(
array(__DIR__.'/Fixtures/Namespaced', array(
- 'Namespaced\\Bar' => realpath(__DIR__).'/Fixtures/Namespaced/Bar.php',
- 'Namespaced\\Foo' => realpath(__DIR__).'/Fixtures/Namespaced/Foo.php',
- 'Namespaced\\Baz' => realpath(__DIR__).'/Fixtures/Namespaced/Baz.php',
+ 'Namespaced\\Bar' => realpath(__DIR__).'/Fixtures/Namespaced/Bar.php',
+ 'Namespaced\\Foo' => realpath(__DIR__).'/Fixtures/Namespaced/Foo.php',
+ 'Namespaced\\Baz' => realpath(__DIR__).'/Fixtures/Namespaced/Baz.php',
'Namespaced\\WithComments' => realpath(__DIR__).'/Fixtures/Namespaced/WithComments.php',
),
),
@@ -85,22 +85,22 @@ public function getTestCreateMapTests()
'NamespaceCollision\\C\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Foo.php',
)),
array(__DIR__.'/Fixtures/Pearlike', array(
- 'Pearlike_Foo' => realpath(__DIR__).'/Fixtures/Pearlike/Foo.php',
- 'Pearlike_Bar' => realpath(__DIR__).'/Fixtures/Pearlike/Bar.php',
- 'Pearlike_Baz' => realpath(__DIR__).'/Fixtures/Pearlike/Baz.php',
+ 'Pearlike_Foo' => realpath(__DIR__).'/Fixtures/Pearlike/Foo.php',
+ 'Pearlike_Bar' => realpath(__DIR__).'/Fixtures/Pearlike/Bar.php',
+ 'Pearlike_Baz' => realpath(__DIR__).'/Fixtures/Pearlike/Baz.php',
'Pearlike_WithComments' => realpath(__DIR__).'/Fixtures/Pearlike/WithComments.php',
)),
array(__DIR__.'/Fixtures/classmap', array(
- 'Foo\\Bar\\A' => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
- 'Foo\\Bar\\B' => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
- 'A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
- 'Alpha\\A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
- 'Alpha\\B' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
- 'Beta\\A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
- 'Beta\\B' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+ 'Foo\\Bar\\A' => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
+ 'Foo\\Bar\\B' => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
+ 'A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+ 'Alpha\\A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+ 'Alpha\\B' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+ 'Beta\\A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+ 'Beta\\B' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
'ClassMap\\SomeInterface' => realpath(__DIR__).'/Fixtures/classmap/SomeInterface.php',
- 'ClassMap\\SomeParent' => realpath(__DIR__).'/Fixtures/classmap/SomeParent.php',
- 'ClassMap\\SomeClass' => realpath(__DIR__).'/Fixtures/classmap/SomeClass.php',
+ 'ClassMap\\SomeParent' => realpath(__DIR__).'/Fixtures/classmap/SomeParent.php',
+ 'ClassMap\\SomeClass' => realpath(__DIR__).'/Fixtures/classmap/SomeClass.php',
)),
);
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php
index 8a3149f3198815f788dc22315a4e8794ca51d391..9b2dff40374e90fdab78c26287812268436bcf55 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -32,8 +32,8 @@
* // register classes with namespaces
* $loader->registerNamespaces(array(
* 'Symfony\Component' => __DIR__.'/component',
- * 'Symfony' => __DIR__.'/framework',
- * 'Sensio' => array(__DIR__.'/src', __DIR__.'/vendor'),
+ * 'Symfony' => __DIR__.'/framework',
+ * 'Sensio' => array(__DIR__.'/src', __DIR__.'/vendor'),
* ));
*
* // register a library using the PEAR naming convention
@@ -74,7 +74,7 @@ class UniversalClassLoader
*/
public function useIncludePath($useIncludePath)
{
- $this->useIncludePath = $useIncludePath;
+ $this->useIncludePath = (bool) $useIncludePath;
}
/**
diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/composer.json b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/composer.json
index 84ce6a0a633a7c9ea8ca7d628a35e06c930b16f2..f323a76c6f5a7abb60d146642ec1f4696e1c4d57 100644
--- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/composer.json
+++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/composer.json
@@ -28,7 +28,7 @@
"target-dir": "Symfony/Component/ClassLoader",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php
index 96bbd11f515ce2f40783c11135d2f5e36f170b36..d0c215e0f2edd5292f4496c1bf2f8c2e33dfee26 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php
@@ -75,4 +75,28 @@ public function getValue()
{
return $this->a * self::A_FACTOR + $this->b * self::B_FACTOR + $this->c * self::C_FACTOR;
}
+
+ /**
+ * Returns -1 if the object specificity is lower than the argument,
+ * 0 if they are equal, and 1 if the argument is lower
+ *
+ * @param Specificity $specificity
+ * @return int
+ */
+ public function compareTo(Specificity $specificity)
+ {
+ if ($this->a !== $specificity->a) {
+ return $this->a > $specificity->a ? 1 : -1;
+ }
+
+ if ($this->b !== $specificity->b) {
+ return $this->b > $specificity->b ? 1 : -1;
+ }
+
+ if ($this->c !== $specificity->c) {
+ return $this->c > $specificity->c ? 1 : -1;
+ }
+
+ return 0;
+ }
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
index 4adfca889d866303688a4438bb3ab420cc38a068..ba5d657f7bff3da5b5b76db47ef78ce4b0bdf0d8 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
@@ -21,13 +21,13 @@
*/
class Token
{
- const TYPE_FILE_END = 'eof';
- const TYPE_DELIMITER = 'delimiter';
+ const TYPE_FILE_END = 'eof';
+ const TYPE_DELIMITER = 'delimiter';
const TYPE_WHITESPACE = 'whitespace';
const TYPE_IDENTIFIER = 'identifier';
- const TYPE_HASH = 'hash';
- const TYPE_NUMBER = 'number';
- const TYPE_STRING = 'string';
+ const TYPE_HASH = 'hash';
+ const TYPE_NUMBER = 'number';
+ const TYPE_STRING = 'string';
/**
* @var int
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
index fae1d4bc9a4535c2796fecc71b78849ad6e46ba8..e0212b1570cf424513db1fa85af0c4af252ea3ae 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
@@ -6,9 +6,11 @@ CssSelector converts CSS selectors to XPath expressions.
The component only goal is to convert CSS selectors to their XPath
equivalents:
- use Symfony\Component\CssSelector\CssSelector;
+```php
+use Symfony\Component\CssSelector\CssSelector;
- print CssSelector::toXPath('div.item > h4 > a');
+print CssSelector::toXPath('div.item > h4 > a');
+```
HTML and XML are different
--------------------------
@@ -18,11 +20,13 @@ default. If you need to use this component with `XML` documents, you have to
disable this `HTML` extension. That's because, `HTML` tag & attribute names
are always lower-cased, but case-sensitive in `XML`:
- // disable `HTML` extension:
- CssSelector::disableHtmlExtension();
+```php
+// disable `HTML` extension:
+CssSelector::disableHtmlExtension();
- // re-enable `HTML` extension:
- CssSelector::enableHtmlExtension();
+// re-enable `HTML` extension:
+CssSelector::enableHtmlExtension();
+```
When the `HTML` extension is enabled, tag names are lower-cased, attribute
names are lower-cased, the following extra pseudo-classes are supported:
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php
index 1f200cffe4f0447e13b5db8bdaee1458f7b8be72..c34fe5fc7348bbf56e9432e4a76354d15dbea3b7 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php
@@ -37,4 +37,26 @@ public function getValueTestData()
array(new Specificity(4, 3, 2), 432),
);
}
+
+ /** @dataProvider getCompareTestData */
+ public function testCompareTo(Specificity $a, Specificity $b, $result)
+ {
+ $this->assertEquals($result, $a->compareTo($b));
+ }
+
+ public function getCompareTestData()
+ {
+ return array(
+ array(new Specificity(0, 0, 0), new Specificity(0, 0, 0), 0),
+ array(new Specificity(0, 0, 1), new Specificity(0, 0, 1), 0),
+ array(new Specificity(0, 0, 2), new Specificity(0, 0, 1), 1),
+ array(new Specificity(0, 0, 2), new Specificity(0, 0, 3), -1),
+ array(new Specificity(0, 4, 0), new Specificity(0, 4, 0), 0),
+ array(new Specificity(0, 6, 0), new Specificity(0, 5, 11), 1),
+ array(new Specificity(0, 7, 0), new Specificity(0, 8, 0), -1),
+ array(new Specificity(9, 0, 0), new Specificity(9, 0, 0), 0),
+ array(new Specificity(11, 0, 0), new Specificity(10, 11, 0), 1),
+ array(new Specificity(12, 11, 0), new Specificity(13, 0, 0), -1),
+ );
+ }
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
index 1b1f00f2863e84b7cfafe08d380cf7d824d7f08b..31d24b28eff3d8ca97db76902680f12466c75a74 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
@@ -31,13 +31,13 @@ public function getAttributeMatchingTranslators()
{
return array(
'exists' => array($this, 'translateExists'),
- '=' => array($this, 'translateEquals'),
- '~=' => array($this, 'translateIncludes'),
- '|=' => array($this, 'translateDashMatch'),
- '^=' => array($this, 'translatePrefixMatch'),
- '$=' => array($this, 'translateSuffixMatch'),
- '*=' => array($this, 'translateSubstringMatch'),
- '!=' => array($this, 'translateDifferent'),
+ '=' => array($this, 'translateEquals'),
+ '~=' => array($this, 'translateIncludes'),
+ '|=' => array($this, 'translateDashMatch'),
+ '^=' => array($this, 'translatePrefixMatch'),
+ '$=' => array($this, 'translateSuffixMatch'),
+ '*=' => array($this, 'translateSubstringMatch'),
+ '!=' => array($this, 'translateDifferent'),
);
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
index ff8f333ada06903c2a60a8dd3750a654dd395410..e849474383134140df99abbefbc7158bfc4faaef 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
@@ -34,12 +34,12 @@ class FunctionExtension extends AbstractExtension
public function getFunctionTranslators()
{
return array(
- 'nth-child' => array($this, 'translateNthChild'),
- 'nth-last-child' => array($this, 'translateNthLastChild'),
- 'nth-of-type' => array($this, 'translateNthOfType'),
+ 'nth-child' => array($this, 'translateNthChild'),
+ 'nth-last-child' => array($this, 'translateNthLastChild'),
+ 'nth-of-type' => array($this, 'translateNthOfType'),
'nth-last-of-type' => array($this, 'translateNthLastOfType'),
- 'contains' => array($this, 'translateContains'),
- 'lang' => array($this, 'translateLang'),
+ 'contains' => array($this, 'translateContains'),
+ 'lang' => array($this, 'translateLang'),
);
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
index aef80523dd0910b192239caeeb681e88d6ff3f5e..71ed4b4a795bcf8085275ca1ee1db3189535e30b 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
@@ -45,14 +45,14 @@ public function __construct(Translator $translator)
public function getPseudoClassTranslators()
{
return array(
- 'checked' => array($this, 'translateChecked'),
- 'link' => array($this, 'translateLink'),
+ 'checked' => array($this, 'translateChecked'),
+ 'link' => array($this, 'translateLink'),
'disabled' => array($this, 'translateDisabled'),
- 'enabled' => array($this, 'translateEnabled'),
+ 'enabled' => array($this, 'translateEnabled'),
'selected' => array($this, 'translateSelected'),
- 'invalid' => array($this, 'translateInvalid'),
- 'hover' => array($this, 'translateHover'),
- 'visited' => array($this, 'translateVisited'),
+ 'invalid' => array($this, 'translateInvalid'),
+ 'hover' => array($this, 'translateHover'),
+ 'visited' => array($this, 'translateVisited'),
);
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
index d71baaa96bcd3c0cf58960c97ba0cabd4674bb30..302f373400ac6018d849ecae236bfd786e508341 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -25,8 +25,8 @@
*/
class NodeExtension extends AbstractExtension
{
- const ELEMENT_NAME_IN_LOWER_CASE = 1;
- const ATTRIBUTE_NAME_IN_LOWER_CASE = 2;
+ const ELEMENT_NAME_IN_LOWER_CASE = 1;
+ const ATTRIBUTE_NAME_IN_LOWER_CASE = 2;
const ATTRIBUTE_VALUE_IN_LOWER_CASE = 4;
/**
@@ -79,15 +79,15 @@ public function hasFlag($flag)
public function getNodeTranslators()
{
return array(
- 'Selector' => array($this, 'translateSelector'),
+ 'Selector' => array($this, 'translateSelector'),
'CombinedSelector' => array($this, 'translateCombinedSelector'),
- 'Negation' => array($this, 'translateNegation'),
- 'Function' => array($this, 'translateFunction'),
- 'Pseudo' => array($this, 'translatePseudo'),
- 'Attribute' => array($this, 'translateAttribute'),
- 'Class' => array($this, 'translateClass'),
- 'Hash' => array($this, 'translateHash'),
- 'Element' => array($this, 'translateElement'),
+ 'Negation' => array($this, 'translateNegation'),
+ 'Function' => array($this, 'translateFunction'),
+ 'Pseudo' => array($this, 'translatePseudo'),
+ 'Attribute' => array($this, 'translateAttribute'),
+ 'Class' => array($this, 'translateClass'),
+ 'Hash' => array($this, 'translateHash'),
+ 'Element' => array($this, 'translateElement'),
);
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
index d230dd7c483f97fd4475c74e9ccde9fe20745caf..d59857225cff11be1aa77b8f33879b27c90da883 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
@@ -30,14 +30,14 @@ class PseudoClassExtension extends AbstractExtension
public function getPseudoClassTranslators()
{
return array(
- 'root' => array($this, 'translateRoot'),
- 'first-child' => array($this, 'translateFirstChild'),
- 'last-child' => array($this, 'translateLastChild'),
+ 'root' => array($this, 'translateRoot'),
+ 'first-child' => array($this, 'translateFirstChild'),
+ 'last-child' => array($this, 'translateLastChild'),
'first-of-type' => array($this, 'translateFirstOfType'),
- 'last-of-type' => array($this, 'translateLastOfType'),
- 'only-child' => array($this, 'translateOnlyChild'),
- 'only-of-type' => array($this, 'translateOnlyOfType'),
- 'empty' => array($this, 'translateEmpty'),
+ 'last-of-type' => array($this, 'translateLastOfType'),
+ 'only-child' => array($this, 'translateOnlyChild'),
+ 'only-of-type' => array($this, 'translateOnlyOfType'),
+ 'empty' => array($this, 'translateEmpty'),
);
}
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
index 4676677ea48847e13c7cc5f6ee7c163071b4b22b..5675aa610646d4a9277ddaf6886daad658e20240 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
@@ -123,17 +123,15 @@ public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::')
$selectors = $this->parseSelectors($cssExpr);
/** @var SelectorNode $selector */
- foreach ($selectors as $selector) {
+ foreach ($selectors as $index => $selector) {
if (null !== $selector->getPseudoElement()) {
throw new ExpressionErrorException('Pseudo-elements are not supported.');
}
- }
- $translator = $this;
+ $selectors[$index] = $this->selectorToXPath($selector, $prefix);
+ }
- return implode(' | ', array_map(function (SelectorNode $selector) use ($translator, $prefix) {
- return $translator->selectorToXPath($selector, $prefix);
- }, $selectors));
+ return implode(' | ', $selectors);
}
/**
diff --git a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json
index 5b4231d7947574057015b85e85f7170a5c44c30d..d47c77fe6444aca9ce20659b8730c3341e8dc54c 100644
--- a/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json
+++ b/core/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md b/core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md
index 776468fb7a59e057aa5dddfa3be4bfc9b4b6eb61..ff7c6af2b7d079f4ad72cf239fd014dfc8d16f1e 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md
@@ -1,6 +1,13 @@
CHANGELOG
=========
+2.6.0
+-----
+
+* generalized ErrorHandler and ExceptionHandler,
+ with some new methods and others deprecated
+* enhanced error messages for uncaught exceptions
+
2.5.0
-----
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Debug.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Debug.php
index e0710c59e677010a667e208ad8dce0c21feccd84..fd308e80036b931930fc8d6a8d18a15b5250a541 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Debug.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Debug.php
@@ -39,15 +39,23 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
static::$enabled = true;
- error_reporting(-1);
+ if (null !== $errorReportingLevel) {
+ error_reporting($errorReportingLevel);
+ } else {
+ error_reporting(-1);
+ }
- ErrorHandler::register($errorReportingLevel, $displayErrors);
if ('cli' !== php_sapi_name()) {
+ ini_set('display_errors', 0);
ExceptionHandler::register();
- // CLI - display errors only if they're not already logged to STDERR
} elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
+ // CLI - display errors only if they're not already logged to STDERR
ini_set('display_errors', 1);
}
+ $handler = ErrorHandler::register();
+ if (!$displayErrors) {
+ $handler->throwAt(0, true);
+ }
DebugClassLoader::enable();
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php b/core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php
index 4a02e616cce8928688938a0e9d5d6ac36e1951ce..ac5536529496e040f1ddf92ddac094d5832b5934 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php
@@ -78,7 +78,8 @@ public function getClassLoader()
public static function enable()
{
// Ensures we don't hit https://bugs.php.net/42098
- class_exists(__NAMESPACE__.'\ErrorHandler', true);
+ class_exists('Symfony\Component\Debug\ErrorHandler');
+ class_exists('Psr\Log\LogLevel');
if (!is_array($functions = spl_autoload_functions())) {
return;
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php b/core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
index b0699f34a870cb79d44b0e175a6d02a34df1cd0d..f6c043287b17b66a3b3670d673f7ab5ab39e7e68 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
@@ -22,188 +22,511 @@
use Symfony\Component\Debug\FatalErrorHandler\FatalErrorHandlerInterface;
/**
- * ErrorHandler.
+ * A generic ErrorHandler for the PHP engine.
+ *
+ * Provides five bit fields that control how errors are handled:
+ * - thrownErrors: errors thrown as \ErrorException
+ * - loggedErrors: logged errors, when not @-silenced
+ * - scopedErrors: errors thrown or logged with their local context
+ * - tracedErrors: errors logged with their stack trace, only once for repeated errors
+ * - screamedErrors: never @-silenced errors
+ *
+ * Each error level can be logged by a dedicated PSR-3 logger object.
+ * Screaming only applies to logging.
+ * Throwing takes precedence over logging.
+ * Uncaught exceptions are logged as E_ERROR.
+ * E_DEPRECATED and E_USER_DEPRECATED levels never throw.
+ * E_RECOVERABLE_ERROR and E_USER_ERROR levels always throw.
+ * Non catchable errors that can be detected at shutdown time are logged when the scream bit field allows so.
+ * As errors have a performance cost, repeated errors are all logged, so that the developer
+ * can see them and weight them as more important to fix than others of the same level.
*
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Konstantin Myakshin <koc-dp@yandex.ru>
* @author Nicolas Grekas <p@tchwork.com>
*/
class ErrorHandler
{
+ /**
+ * @deprecated since 2.6, to be removed in 3.0.
+ */
const TYPE_DEPRECATION = -100;
private $levels = array(
- E_WARNING => 'Warning',
- E_NOTICE => 'Notice',
- E_USER_ERROR => 'User Error',
- E_USER_WARNING => 'User Warning',
- E_USER_NOTICE => 'User Notice',
- E_STRICT => 'Runtime Notice',
+ E_DEPRECATED => 'Deprecated',
+ E_USER_DEPRECATED => 'User Deprecated',
+ E_NOTICE => 'Notice',
+ E_USER_NOTICE => 'User Notice',
+ E_STRICT => 'Runtime Notice',
+ E_WARNING => 'Warning',
+ E_USER_WARNING => 'User Warning',
+ E_COMPILE_WARNING => 'Compile Warning',
+ E_CORE_WARNING => 'Core Warning',
+ E_USER_ERROR => 'User Error',
E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
- E_DEPRECATED => 'Deprecated',
- E_USER_DEPRECATED => 'User Deprecated',
- E_ERROR => 'Error',
- E_CORE_ERROR => 'Core Error',
- E_COMPILE_ERROR => 'Compile Error',
- E_PARSE => 'Parse Error',
+ E_COMPILE_ERROR => 'Compile Error',
+ E_PARSE => 'Parse Error',
+ E_ERROR => 'Error',
+ E_CORE_ERROR => 'Core Error',
);
- private $level;
-
- private $reservedMemory;
+ private $loggers = array(
+ E_DEPRECATED => array(null, LogLevel::INFO),
+ E_USER_DEPRECATED => array(null, LogLevel::INFO),
+ E_NOTICE => array(null, LogLevel::NOTICE),
+ E_USER_NOTICE => array(null, LogLevel::NOTICE),
+ E_STRICT => array(null, LogLevel::NOTICE),
+ E_WARNING => array(null, LogLevel::WARNING),
+ E_USER_WARNING => array(null, LogLevel::WARNING),
+ E_COMPILE_WARNING => array(null, LogLevel::WARNING),
+ E_CORE_WARNING => array(null, LogLevel::WARNING),
+ E_USER_ERROR => array(null, LogLevel::ERROR),
+ E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
+ E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
+ E_PARSE => array(null, LogLevel::EMERGENCY),
+ E_ERROR => array(null, LogLevel::EMERGENCY),
+ E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
+ );
- private $displayErrors;
+ private $thrownErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
+ private $scopedErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
+ private $tracedErrors = 0x77FB; // E_ALL - E_STRICT - E_PARSE
+ private $screamedErrors = 0x55; // E_ERROR + E_CORE_ERROR + E_COMPILE_ERROR + E_PARSE
+ private $loggedErrors = 0;
- /**
- * @var LoggerInterface[] Loggers for channels
- */
- private static $loggers = array();
+ private $loggedTraces = array();
+ private $isRecursive = 0;
+ private $exceptionHandler;
+ private static $reservedMemory;
private static $stackedErrors = array();
-
private static $stackedErrorLevels = array();
+ /**
+ * Same init value as thrownErrors
+ *
+ * @deprecated since 2.6, to be removed in 3.0.
+ */
+ private $displayErrors = 0x1FFF;
+
/**
* Registers the error handler.
*
- * @param int $level The level at which the conversion to Exception is done (null to use the error_reporting() value and 0 to disable)
- * @param bool $displayErrors Display errors (for dev environment) or just log them (production usage)
+ * @param self|null|int $handler The handler to register, or @deprecated (since 2.6, to be removed in 3.0) bit field of thrown levels
+ * @param bool $replace Whether to replace or not any existing handler
*
- * @return ErrorHandler The registered error handler
+ * @return self The registered error handler
*/
- public static function register($level = null, $displayErrors = true)
+ public static function register($handler = null, $replace = true)
{
- $handler = new static();
- $handler->setLevel($level);
- $handler->setDisplayErrors($displayErrors);
+ if (null === self::$reservedMemory) {
+ self::$reservedMemory = str_repeat('x', 10240);
+ register_shutdown_function(__CLASS__.'::handleFatalError');
+ }
+
+ $levels = -1;
- ini_set('display_errors', 0);
- set_error_handler(array($handler, 'handle'));
- register_shutdown_function(array($handler, 'handleFatal'));
- $handler->reservedMemory = str_repeat('x', 10240);
+ if ($handlerIsNew = !$handler instanceof self) {
+ // @deprecated polymorphism, to be removed in 3.0
+ if (null !== $handler) {
+ $levels = $replace ? $handler : 0;
+ $replace = true;
+ }
+ $handler = new static();
+ }
+
+ $prev = set_error_handler(array($handler, 'handleError'), $handler->thrownErrors | $handler->loggedErrors);
+
+ if ($handlerIsNew && is_array($prev) && $prev[0] instanceof self) {
+ $handler = $prev[0];
+ $replace = false;
+ }
+ if ($replace || !$prev) {
+ $handler->setExceptionHandler(set_exception_handler(array($handler, 'handleException')));
+ } else {
+ restore_error_handler();
+ }
+
+ $handler->throwAt($levels & $handler->thrownErrors, true);
return $handler;
}
/**
- * Sets the level at which the conversion to Exception is done.
+ * Sets a logger to non assigned errors levels.
*
- * @param int|null $level The level (null to use the error_reporting() value and 0 to disable)
+ * @param LoggerInterface $logger A PSR-3 logger to put as default for the given levels
+ * @param array|int $levels An array map of E_* to LogLevel::* or an integer bit field of E_* constants
+ * @param bool $replace Whether to replace or not any existing logger
*/
- public function setLevel($level)
+ public function setDefaultLogger(LoggerInterface $logger, $levels = null, $replace = false)
{
- $this->level = null === $level ? error_reporting() : $level;
+ $loggers = array();
+
+ if (is_array($levels)) {
+ foreach ($levels as $type => $logLevel) {
+ if (empty($this->loggers[$type][0]) || $replace) {
+ $loggers[$type] = array($logger, $logLevel);
+ }
+ }
+ } else {
+ if (null === $levels) {
+ $levels = E_ALL | E_STRICT;
+ }
+ foreach ($this->loggers as $type => $log) {
+ if (($type & $levels) && (empty($log[0]) || $replace)) {
+ $log[0] = $logger;
+ $loggers[$type] = $log;
+ }
+ }
+ }
+
+ $this->setLoggers($loggers);
}
/**
- * Sets the display_errors flag value.
+ * Sets a logger for each error level.
*
- * @param int $displayErrors The display_errors flag value
+ * @param array $loggers Error levels to [LoggerInterface|null, LogLevel::*] map
+ *
+ * @return array The previous map
+ *
+ * @throws \InvalidArgumentException
*/
- public function setDisplayErrors($displayErrors)
+ public function setLoggers(array $loggers)
{
- $this->displayErrors = $displayErrors;
+ $prevLogged = $this->loggedErrors;
+ $prev = $this->loggers;
+
+ foreach ($loggers as $type => $log) {
+ if (!isset($prev[$type])) {
+ throw new \InvalidArgumentException('Unknown error type: '.$type);
+ }
+ if (!is_array($log)) {
+ $log = array($log);
+ } elseif (!array_key_exists(0, $log)) {
+ throw new \InvalidArgumentException('No logger provided');
+ }
+ if (null === $log[0]) {
+ $this->loggedErrors &= ~$type;
+ } elseif ($log[0] instanceof LoggerInterface) {
+ $this->loggedErrors |= $type;
+ } else {
+ throw new \InvalidArgumentException('Invalid logger provided');
+ }
+ $this->loggers[$type] = $log + $prev[$type];
+ }
+ $this->reRegister($prevLogged | $this->thrownErrors);
+
+ return $prev;
}
/**
- * Sets a logger for the given channel.
+ * Sets a user exception handler.
*
- * @param LoggerInterface $logger A logger interface
- * @param string $channel The channel associated with the logger (deprecation, emergency or scream)
+ * @param callable $handler A handler that will be called on Exception
+ *
+ * @return callable|null The previous exception handler
+ *
+ * @throws \InvalidArgumentException
*/
- public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
+ public function setExceptionHandler($handler)
{
- self::$loggers[$channel] = $logger;
+ if (null !== $handler && !is_callable($handler)) {
+ throw new \LogicException('The exception handler must be a valid PHP callable.');
+ }
+ $prev = $this->exceptionHandler;
+ $this->exceptionHandler = $handler;
+
+ return $prev;
}
/**
- * @throws \ErrorException When error_reporting returns error
+ * Sets the error levels that are to be thrown.
+ *
+ * @param int $levels A bit field of E_* constants for thrown errors
+ * @param bool $replace Replace or amend the previous value
+ *
+ * @return int The previous value
*/
- public function handle($level, $message, $file = 'unknown', $line = 0, $context = array())
+ public function throwAt($levels, $replace = false)
{
- if ($level & (E_USER_DEPRECATED | E_DEPRECATED)) {
- if (isset(self::$loggers['deprecation'])) {
- if (self::$stackedErrorLevels) {
- self::$stackedErrors[] = func_get_args();
+ $prev = $this->thrownErrors;
+ $this->thrownErrors = ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
+ if (!$replace) {
+ $this->thrownErrors |= $prev;
+ }
+ $this->reRegister($prev | $this->loggedErrors);
+
+ // $this->displayErrors is @deprecated since 2.6
+ $this->displayErrors = $this->thrownErrors;
+
+ return $prev;
+ }
+
+ /**
+ * Sets the error levels that are logged or thrown with their local scope.
+ *
+ * @param int $levels A bit field of E_* constants for scoped errors
+ * @param bool $replace Replace or amend the previous value
+ *
+ * @return int The previous value
+ */
+ public function scopeAt($levels, $replace = false)
+ {
+ $prev = $this->scopedErrors;
+ $this->scopedErrors = (int) $levels;
+ if (!$replace) {
+ $this->scopedErrors |= $prev;
+ }
+
+ return $prev;
+ }
+
+ /**
+ * Sets the error levels that are logged with their stack trace.
+ *
+ * @param int $levels A bit field of E_* constants for traced errors
+ * @param bool $replace Replace or amend the previous value
+ *
+ * @return int The previous value
+ */
+ public function traceAt($levels, $replace = false)
+ {
+ $prev = $this->tracedErrors;
+ $this->tracedErrors = (int) $levels;
+ if (!$replace) {
+ $this->tracedErrors |= $prev;
+ }
+
+ return $prev;
+ }
+
+ /**
+ * Sets the error levels where the @-operator is ignored.
+ *
+ * @param int $levels A bit field of E_* constants for screamed errors
+ * @param bool $replace Replace or amend the previous value
+ *
+ * @return int The previous value
+ */
+ public function screamAt($levels, $replace = false)
+ {
+ $prev = $this->screamedErrors;
+ $this->screamedErrors = (int) $levels;
+ if (!$replace) {
+ $this->screamedErrors |= $prev;
+ }
+
+ return $prev;
+ }
+
+ /**
+ * Re-registers as a PHP error handler if levels changed.
+ */
+ private function reRegister($prev)
+ {
+ if ($prev !== $this->thrownErrors | $this->loggedErrors) {
+ $handler = set_error_handler('var_dump', 0);
+ $handler = is_array($handler) ? $handler[0] : null;
+ restore_error_handler();
+ if ($handler === $this) {
+ restore_error_handler();
+ set_error_handler(array($this, 'handleError'), $this->thrownErrors | $this->loggedErrors);
+ }
+ }
+ }
+
+ /**
+ * Handles errors by filtering then logging them according to the configured bit fields.
+ *
+ * @param int $type One of the E_* constants
+ * @param string $file
+ * @param int $line
+ * @param array $context
+ *
+ * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself.
+ *
+ * @throws \ErrorException When $this->thrownErrors requests so
+ *
+ * @internal
+ */
+ public function handleError($type, $message, $file, $line, array $context)
+ {
+ $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR;
+ $log = $this->loggedErrors & $type;
+ $throw = $this->thrownErrors & $type & $level;
+ $type &= $level | $this->screamedErrors;
+
+ if ($type && ($log || $throw)) {
+ if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
+ $e = $context; // Whatever the signature of the method,
+ unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
+ $context = $e;
+ }
+
+ if ($throw) {
+ if (($this->scopedErrors & $type) && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
+ // Checking for class existence is a work around for https://bugs.php.net/42098
+ $throw = new ContextErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line, $context);
} else {
- if (version_compare(PHP_VERSION, '5.4', '<')) {
- $stack = array_map(
- function ($row) {
- unset($row['args']);
-
- return $row;
- },
- array_slice(debug_backtrace(false), 0, 10)
- );
- } else {
- $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10);
- }
+ $throw = new \ErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line);
+ }
+
+ if (PHP_VERSION_ID <= 50407 && (PHP_VERSION_ID >= 50400 || PHP_VERSION_ID <= 50317)) {
+ // Exceptions thrown from error handlers are sometimes not caught by the exception
+ // handler and shutdown handlers are bypassed before 5.4.8/5.3.18.
+ // We temporarily re-enable display_errors to prevent any blank page related to this bug.
- self::$loggers['deprecation']->warning($message, array('type' => self::TYPE_DEPRECATION, 'stack' => $stack));
+ $throw->errorHandlerCanary = new ErrorHandlerCanary();
}
- return true;
- }
- } elseif ($this->displayErrors && error_reporting() & $level && $this->level & $level) {
- if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
- $c = $context; // Whatever the signature of the method,
- unset($c['GLOBALS'], $context); // $context is always a reference in 5.3
- $context = $c;
+ throw $throw;
}
- $exception = sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line);
- if ($context && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
- // Checking for class existence is a work around for https://bugs.php.net/42098
- $exception = new ContextErrorException($exception, 0, $level, $file, $line, $context);
+ // For duplicated errors, log the trace only once
+ $e = md5("{$type}/{$line}/{$file}\x00{$message}", true);
+ $trace = true;
+
+ if (!($this->tracedErrors & $type) || isset($this->loggedTraces[$e])) {
+ $trace = false;
} else {
- $exception = new \ErrorException($exception, 0, $level, $file, $line);
+ $this->loggedTraces[$e] = 1;
}
- if (PHP_VERSION_ID <= 50407 && (PHP_VERSION_ID >= 50400 || PHP_VERSION_ID <= 50317)) {
- // Exceptions thrown from error handlers are sometimes not caught by the exception
- // handler and shutdown handlers are bypassed before 5.4.8/5.3.18.
- // We temporarily re-enable display_errors to prevent any blank page related to this bug.
+ $e = compact('type', 'file', 'line', 'level');
- $exception->errorHandlerCanary = new ErrorHandlerCanary();
+ if ($type & $level) {
+ if ($this->scopedErrors & $type) {
+ $e['context'] = $context;
+ if ($trace) {
+ $e['stack'] = debug_backtrace(true); // Provide object
+ }
+ } elseif ($trace) {
+ $e['stack'] = debug_backtrace(PHP_VERSION_ID >= 50306 ? DEBUG_BACKTRACE_IGNORE_ARGS : false);
+ }
}
- throw $exception;
+ if ($this->isRecursive) {
+ $log = 0;
+ } elseif (self::$stackedErrorLevels) {
+ self::$stackedErrors[] = array($this->loggers[$type], $message, $e);
+ } else {
+ try {
+ $this->isRecursive = true;
+ $this->loggers[$type][0]->log($this->loggers[$type][1], $message, $e);
+ $this->isRecursive = false;
+ } catch (\Exception $e) {
+ $this->isRecursive = false;
+
+ throw $e;
+ }
+ }
}
- if (isset(self::$loggers['scream']) && !(error_reporting() & $level)) {
- if (self::$stackedErrorLevels) {
- self::$stackedErrors[] = func_get_args();
+ return $type && $log;
+ }
+
+ /**
+ * Handles an exception by logging then forwarding it to an other handler.
+ *
+ * @param \Exception $exception An exception to handle
+ * @param array $error An array as returned by error_get_last()
+ *
+ * @internal
+ */
+ public function handleException(\Exception $exception, array $error = null)
+ {
+ $level = error_reporting();
+ if ($this->loggedErrors & E_ERROR & ($level | $this->screamedErrors)) {
+ $e = array(
+ 'type' => E_ERROR,
+ 'file' => $exception->getFile(),
+ 'line' => $exception->getLine(),
+ 'level' => $level,
+ 'stack' => $exception->getTrace(),
+ );
+ if ($exception instanceof FatalErrorException) {
+ $message = 'Fatal '.$exception->getMessage();
+ } elseif ($exception instanceof \ErrorException) {
+ $message = 'Uncaught '.$exception->getMessage();
+ if ($exception instanceof ContextErrorException) {
+ $e['context'] = $exception->getContext();
+ }
} else {
- switch ($level) {
- case E_USER_ERROR:
- case E_RECOVERABLE_ERROR:
- $logLevel = LogLevel::ERROR;
- break;
-
- case E_WARNING:
- case E_USER_WARNING:
- $logLevel = LogLevel::WARNING;
- break;
-
- default:
- $logLevel = LogLevel::NOTICE;
- break;
+ $message = 'Uncaught Exception: '.$exception->getMessage();
+ }
+ if ($this->loggedErrors & $e['type']) {
+ $this->loggers[$e['type']][0]->log($this->loggers[$e['type']][1], $message, $e);
+ }
+ }
+ if ($exception instanceof FatalErrorException && !$exception instanceof OutOfMemoryException && $error) {
+ foreach ($this->getFatalErrorHandlers() as $handler) {
+ if ($e = $handler->handleError($error, $exception)) {
+ $exception = $e;
+ break;
}
-
- self::$loggers['scream']->log($logLevel, $message, array(
- 'type' => $level,
- 'file' => $file,
- 'line' => $line,
- 'scream' => error_reporting(),
- ));
}
}
+ if (empty($this->exceptionHandler)) {
+ throw $exception; // Give back $exception to the native handler
+ }
+ try {
+ call_user_func($this->exceptionHandler, $exception);
+ } catch (\Exception $handlerException) {
+ $this->exceptionHandler = null;
+ $this->handleException($handlerException);
+ }
+ }
- return false;
+ /**
+ * Shutdown registered function for handling PHP fatal errors.
+ *
+ * @param array $error An array as returned by error_get_last()
+ *
+ * @internal
+ */
+ public static function handleFatalError(array $error = null)
+ {
+ self::$reservedMemory = '';
+ gc_collect_cycles();
+ $handler = set_error_handler('var_dump', 0);
+ $handler = is_array($handler) ? $handler[0] : null;
+ restore_error_handler();
+ if ($handler instanceof self) {
+ if (null === $error) {
+ $error = error_get_last();
+ }
+
+ try {
+ while (self::$stackedErrorLevels) {
+ static::unstackErrors();
+ }
+ } catch (\Exception $exception) {
+ // Handled below
+ }
+
+ if ($error && ($error['type'] & (E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR))) {
+ // Let's not throw anymore but keep logging
+ $handler->throwAt(0, true);
+
+ if (0 === strpos($error['message'], 'Allowed memory') || 0 === strpos($error['message'], 'Out of memory')) {
+ $exception = new OutOfMemoryException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, false);
+ } else {
+ $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true);
+ }
+ } elseif (!isset($exception)) {
+ return;
+ }
+
+ try {
+ $handler->handleException($exception, $error);
+ } catch (FatalErrorException $e) {
+ // Ignore this re-throw
+ }
+ }
}
/**
- * Configure the error handler for delayed handling.
+ * Configures the error handler for delayed handling.
* Ensures also that non-catchable fatal errors are never silenced.
*
* As shown by http://bugs.php.net/42098 and http://bugs.php.net/60724
@@ -219,7 +542,7 @@ public static function stackErrors()
}
/**
- * Unstacks stacked errors and forwards to the regular handler
+ * Unstacks stacked errors and forwards to the logger
*/
public static function unstackErrors()
{
@@ -237,64 +560,12 @@ public static function unstackErrors()
$errors = self::$stackedErrors;
self::$stackedErrors = array();
- $errorHandler = set_error_handler('var_dump');
- restore_error_handler();
-
- if ($errorHandler) {
- foreach ($errors as $e) {
- call_user_func_array($errorHandler, $e);
- }
+ foreach ($errors as $e) {
+ $e[0][0]->log($e[0][1], $e[1], $e[2]);
}
}
}
- public function handleFatal()
- {
- $this->reservedMemory = '';
- gc_collect_cycles();
- $error = error_get_last();
-
- // get current exception handler
- $exceptionHandler = set_exception_handler('var_dump');
- restore_exception_handler();
-
- try {
- while (self::$stackedErrorLevels) {
- static::unstackErrors();
- }
- } catch (\Exception $exception) {
- if ($exceptionHandler) {
- call_user_func($exceptionHandler, $exception);
-
- return;
- }
-
- if ($this->displayErrors) {
- ini_set('display_errors', 1);
- }
-
- throw $exception;
- }
-
- if (!$error || !$this->level || !($error['type'] & (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_PARSE))) {
- return;
- }
-
- if (isset(self::$loggers['emergency'])) {
- $fatal = array(
- 'type' => $error['type'],
- 'file' => $error['file'],
- 'line' => $error['line'],
- );
-
- self::$loggers['emergency']->emergency($error['message'], $fatal);
- }
-
- if ($this->displayErrors && $exceptionHandler) {
- $this->handleFatalError($exceptionHandler, $error);
- }
- }
-
/**
* Gets the fatal error handlers.
*
@@ -311,33 +582,81 @@ protected function getFatalErrorHandlers()
);
}
- private function handleFatalError($exceptionHandler, array $error)
+ /**
+ * Sets the level at which the conversion to Exception is done.
+ *
+ * @param int|null $level The level (null to use the error_reporting() value and 0 to disable)
+ *
+ * @deprecated since 2.6, to be removed in 3.0. Use throwAt() instead.
+ */
+ public function setLevel($level)
{
- // Let PHP handle any further error
- set_error_handler('var_dump', 0);
- ini_set('display_errors', 1);
-
- $level = isset($this->levels[$error['type']]) ? $this->levels[$error['type']] : $error['type'];
- $message = sprintf('%s: %s in %s line %d', $level, $error['message'], $error['file'], $error['line']);
- if (0 === strpos($error['message'], 'Allowed memory') || 0 === strpos($error['message'], 'Out of memory')) {
- $exception = new OutOfMemoryException($message, 0, $error['type'], $error['file'], $error['line'], 3, false);
- } else {
- $exception = new FatalErrorException($message, 0, $error['type'], $error['file'], $error['line'], 3, true);
+ $level = null === $level ? error_reporting() : $level;
+ $this->throwAt($level, true);
+ }
- foreach ($this->getFatalErrorHandlers() as $handler) {
- if ($e = $handler->handleError($error, $exception)) {
- $exception = $e;
- break;
- }
- }
+ /**
+ * Sets the display_errors flag value.
+ *
+ * @param int $displayErrors The display_errors flag value
+ *
+ * @deprecated since 2.6, to be removed in 3.0. Use throwAt() instead.
+ */
+ public function setDisplayErrors($displayErrors)
+ {
+ if ($displayErrors) {
+ $this->throwAt($this->displayErrors, true);
+ } else {
+ $displayErrors = $this->displayErrors;
+ $this->throwAt(0, true);
+ $this->displayErrors = $displayErrors;
}
+ }
- try {
- call_user_func($exceptionHandler, $exception);
- } catch (\Exception $e) {
- // The handler failed. Let PHP handle that now.
- throw $exception;
+ /**
+ * Sets a logger for the given channel.
+ *
+ * @param LoggerInterface $logger A logger interface
+ * @param string $channel The channel associated with the logger (deprecation, emergency or scream)
+ *
+ * @deprecated since 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
+ */
+ public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
+ {
+ $handler = set_error_handler('var_dump', 0);
+ $handler = is_array($handler) ? $handler[0] : null;
+ restore_error_handler();
+ if (!$handler instanceof self) {
+ return;
}
+ if ('deprecation' === $channel) {
+ $handler->setDefaultLogger($logger, E_DEPRECATED | E_USER_DEPRECATED, true);
+ $handler->screamAt(E_DEPRECATED | E_USER_DEPRECATED);
+ } elseif ('scream' === $channel) {
+ $handler->setDefaultLogger($logger, E_ALL | E_STRICT, false);
+ $handler->screamAt(E_ALL | E_STRICT);
+ } elseif ('emergency' === $channel) {
+ $handler->setDefaultLogger($logger, E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR, true);
+ $handler->screamAt(E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
+ }
+ }
+
+ /**
+ * @deprecated since 2.6, to be removed in 3.0. Use handleError() instead.
+ */
+ public function handle($level, $message, $file = 'unknown', $line = 0, $context = array())
+ {
+ return $this->handleError($level, $message, $file, $line, (array) $context);
+ }
+
+ /**
+ * Handles PHP fatal errors.
+ *
+ * @deprecated since 2.6, to be removed in 3.0. Use handleFatalError() instead.
+ */
+ public function handleFatal()
+ {
+ static::handleFatalError();
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php
index eb49d4609fdf6fb0f1200483cc8dec9f86c8aed2..fdfba709a7ffda8eb699af20f1c668b01c1b3a49 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php
@@ -66,8 +66,8 @@ public function toArray()
foreach (array_merge(array($this), $this->getAllPrevious()) as $exception) {
$exceptions[] = array(
'message' => $exception->getMessage(),
- 'class' => $exception->getClass(),
- 'trace' => $exception->getTrace(),
+ 'class' => $exception->getClass(),
+ 'trace' => $exception->getTrace(),
);
}
@@ -179,14 +179,14 @@ public function setTrace($trace, $file, $line)
{
$this->trace = array();
$this->trace[] = array(
- 'namespace' => '',
+ 'namespace' => '',
'short_class' => '',
- 'class' => '',
- 'type' => '',
- 'function' => '',
- 'file' => $file,
- 'line' => $line,
- 'args' => array(),
+ 'class' => '',
+ 'type' => '',
+ 'function' => '',
+ 'file' => $file,
+ 'line' => $line,
+ 'args' => array(),
);
foreach ($trace as $entry) {
$class = '';
@@ -198,14 +198,14 @@ public function setTrace($trace, $file, $line)
}
$this->trace[] = array(
- 'namespace' => $namespace,
+ 'namespace' => $namespace,
'short_class' => $class,
- 'class' => isset($entry['class']) ? $entry['class'] : '',
- 'type' => isset($entry['type']) ? $entry['type'] : '',
- 'function' => isset($entry['function']) ? $entry['function'] : null,
- 'file' => isset($entry['file']) ? $entry['file'] : null,
- 'line' => isset($entry['line']) ? $entry['line'] : null,
- 'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),
+ 'class' => isset($entry['class']) ? $entry['class'] : '',
+ 'type' => isset($entry['type']) ? $entry['type'] : '',
+ 'function' => isset($entry['function']) ? $entry['function'] : null,
+ 'file' => isset($entry['file']) ? $entry['file'] : null,
+ 'line' => isset($entry['line']) ? $entry['line'] : null,
+ 'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),
);
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php b/core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php
index 6c12979d6e0cd841d14946782b001afbf84766c6..2c11619f14128142d511aef93a7b537b2871387b 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php
@@ -34,29 +34,33 @@
class ExceptionHandler
{
private $debug;
- private $charset;
private $handler;
private $caughtBuffer;
private $caughtLength;
+ private $fileLinkFormat;
- public function __construct($debug = true, $charset = 'UTF-8')
+ public function __construct($debug = true, $fileLinkFormat = null)
{
$this->debug = $debug;
- $this->charset = $charset;
+ $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
}
/**
* Registers the exception handler.
*
- * @param bool $debug
+ * @param bool $debug
*
* @return ExceptionHandler The registered exception handler
*/
- public static function register($debug = true)
+ public static function register($debug = true, $fileLinkFormat = null)
{
- $handler = new static($debug);
+ $handler = new static($debug, $fileLinkFormat = null);
- set_exception_handler(array($handler, 'handle'));
+ $prev = set_exception_handler(array($handler, 'handle'));
+ if (is_array($prev) && $prev[0] instanceof ErrorHandler) {
+ restore_exception_handler();
+ $prev[0]->setExceptionHandler(array($handler, 'handle'));
+ }
return $handler;
}
@@ -79,6 +83,21 @@ public function setHandler($handler)
return $old;
}
+ /**
+ * Sets the format for links to source files.
+ *
+ * @param string $format The format for links to source files
+ *
+ * @return string The previous file link format.
+ */
+ public function setFileLinkFormat($format)
+ {
+ $old = $this->fileLinkFormat;
+ $this->fileLinkFormat = $format;
+
+ return $old;
+ }
+
/**
* Sends a response for the given Exception.
*
@@ -205,29 +224,26 @@ public function getContent(FlattenException $exception)
$total = $count + 1;
foreach ($exception->toArray() as $position => $e) {
$ind = $count - $position + 1;
- $class = $this->abbrClass($e['class']);
- $message = nl2br($e['message']);
+ $class = $this->formatClass($e['class']);
+ $message = nl2br(self::utf8Htmlize($e['message']));
$content .= sprintf(<<<EOF
- <div class="block_exception clear_fix">
- <h2><span>%d/%d</span> %s: %s</h2>
- </div>
+ <h2 class="block_exception clear_fix">
+ <span class="exception_counter">%d/%d</span>
+ <span class="exception_title">%s%s:</span>
+ <span class="exception_message">%s</span>
+ </h2>
<div class="block">
<ol class="traces list_exception">
EOF
- , $ind, $total, $class, $message);
+ , $ind, $total, $class, $this->formatPath($e['trace'][0]['file'], $e['trace'][0]['line']), $message);
foreach ($e['trace'] as $trace) {
$content .= ' <li>';
if ($trace['function']) {
- $content .= sprintf('at %s%s%s(%s)', $this->abbrClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
+ $content .= sprintf('at %s%s%s(%s)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
}
if (isset($trace['file']) && isset($trace['line'])) {
- if ($linkFormat = ini_get('xdebug.file_link_format')) {
- $link = str_replace(array('%f', '%l'), array($trace['file'], $trace['line']), $linkFormat);
- $content .= sprintf(' in <a href="%s" title="Go to source">%s line %s</a>', $link, $trace['file'], $trace['line']);
- } else {
- $content .= sprintf(' in %s line %s', $trace['file'], $trace['line']);
- }
+ $content .= $this->formatPath($trace['file'], $trace['line']);
}
$content .= "</li>\n";
}
@@ -272,12 +288,14 @@ public function getStylesheet(FlattenException $exception)
.sf-reset abbr { border-bottom: 1px dotted #000; cursor: help; }
.sf-reset p { font-size:14px; line-height:20px; color:#868686; padding-bottom:20px }
.sf-reset strong { font-weight:bold; }
- .sf-reset a { color:#6c6159; }
+ .sf-reset a { color:#6c6159; cursor: default; }
.sf-reset a img { border:none; }
.sf-reset a:hover { text-decoration:underline; }
.sf-reset em { font-style:italic; }
.sf-reset h1, .sf-reset h2 { font: 20px Georgia, "Times New Roman", Times, serif }
- .sf-reset h2 span { background-color: #fff; color: #333; padding: 6px; float: left; margin-right: 10px; }
+ .sf-reset .exception_counter { background-color: #fff; color: #333; padding: 6px; float: left; margin-right: 10px; float: left; display: block; }
+ .sf-reset .exception_title { margin-left: 3em; margin-bottom: 0.7em; display: block; }
+ .sf-reset .exception_message { margin-left: 3em; display: block; }
.sf-reset .traces li { font-size:12px; padding: 2px 4px; list-style-type:decimal; margin-left:20px; }
.sf-reset .block { background-color:#FFFFFF; padding:10px 28px; margin-bottom:20px;
-webkit-border-bottom-right-radius: 16px;
@@ -303,8 +321,8 @@ public function getStylesheet(FlattenException $exception)
overflow: hidden;
word-wrap: break-word;
}
- .sf-reset li a { background:none; color:#868686; text-decoration:none; }
- .sf-reset li a:hover { background:none; color:#313131; text-decoration:underline; }
+ .sf-reset a { background:none; color:#868686; text-decoration:none; }
+ .sf-reset a:hover { background:none; color:#313131; text-decoration:underline; }
.sf-reset ol { padding: 10px 0; }
.sf-reset h1 { background-color:#FFFFFF; padding: 15px 28px; margin-bottom: 20px;
-webkit-border-radius: 10px;
@@ -321,7 +339,7 @@ private function decorate($content, $css)
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <meta charset="UTF-8" />
<meta name="robots" content="noindex,nofollow" />
<style>
/* Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html */
@@ -340,13 +358,27 @@ private function decorate($content, $css)
EOF;
}
- private function abbrClass($class)
+ private function formatClass($class)
{
$parts = explode('\\', $class);
return sprintf("<abbr title=\"%s\">%s</abbr>", $class, array_pop($parts));
}
+ private function formatPath($path, $line)
+ {
+ $path = self::utf8Htmlize($path);
+ $file = preg_match('#[^/\\\\]*$#', $path, $file) ? $file[0] : $path;
+
+ if ($linkFormat = $this->fileLinkFormat) {
+ $link = str_replace(array('%f', '%l'), array($path, $line), $linkFormat);
+
+ return sprintf(' in <a href="%s" title="Go to source">%s line %d</a>', $link, $file, $line);
+ }
+
+ return sprintf(' in <a title="%s line %3$d" ondblclick="var f=this.innerHTML;this.innerHTML=this.title;this.title=f;">%s line %d</a>', $path, $file, $line);
+ }
+
/**
* Formats an array as a string.
*
@@ -359,11 +391,11 @@ private function formatArgs(array $args)
$result = array();
foreach ($args as $key => $item) {
if ('object' === $item[0]) {
- $formattedValue = sprintf("<em>object</em>(%s)", $this->abbrClass($item[1]));
+ $formattedValue = sprintf("<em>object</em>(%s)", $this->formatClass($item[1]));
} elseif ('array' === $item[0]) {
$formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
- } elseif ('string' === $item[0]) {
- $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset));
+ } elseif ('string' === $item[0]) {
+ $formattedValue = sprintf("'%s'", self::utf8Htmlize($item[1]));
} elseif ('null' === $item[0]) {
$formattedValue = '<em>null</em>';
} elseif ('boolean' === $item[0]) {
@@ -371,7 +403,7 @@ private function formatArgs(array $args)
} elseif ('resource' === $item[0]) {
$formattedValue = '<em>resource</em>';
} else {
- $formattedValue = str_replace("\n", '', var_export(htmlspecialchars((string) $item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset), true));
+ $formattedValue = str_replace("\n", '', var_export(self::utf8Htmlize((string) $item[1]), true));
}
$result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
@@ -380,6 +412,25 @@ private function formatArgs(array $args)
return implode(', ', $result);
}
+ /**
+ * Returns an UTF-8 and HTML encoded string
+ */
+ protected static function utf8Htmlize($str)
+ {
+ if (!preg_match('//u', $str) && function_exists('iconv')) {
+ set_error_handler('var_dump', 0);
+ $charset = ini_get('default_charset');
+ if ('UTF-8' === $charset || $str !== @iconv($charset, $charset, $str)) {
+ $charset = 'CP1252';
+ }
+ restore_error_handler();
+
+ $str = iconv($charset, 'UTF-8', $str);
+ }
+
+ return htmlspecialchars($str, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+ }
+
/**
* @internal
*/
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
index 2d543ed2b4d645af0cbc1c069049c7adea8a4af7..2b37ee99942227eff8819b2e02bc04fa2aab2ff4 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -51,29 +51,23 @@ public function handleError(array $error, FatalErrorException $exception)
if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedClassName, '\\')) {
$className = substr($fullyQualifiedClassName, $namespaceSeparatorIndex + 1);
$namespacePrefix = substr($fullyQualifiedClassName, 0, $namespaceSeparatorIndex);
- $message = sprintf(
- 'Attempted to load %s "%s" from namespace "%s" in %s line %d. Do you need to "use" it from another namespace?',
- $typeName,
- $className,
- $namespacePrefix,
- $error['file'],
- $error['line']
- );
+ $message = sprintf('Attempted to load %s "%s" from namespace "%s".', $typeName, $className, $namespacePrefix);
+ $tail = ' for another namespace?';
} else {
$className = $fullyQualifiedClassName;
- $message = sprintf(
- 'Attempted to load %s "%s" from the global namespace in %s line %d. Did you forget a use statement for this %s?',
- $typeName,
- $className,
- $error['file'],
- $error['line'],
- $typeName
- );
+ $message = sprintf('Attempted to load %s "%s" from the global namespace.', $typeName, $className);
+ $tail = '?';
}
- if ($classes = $this->getClassCandidates($className)) {
- $message .= sprintf(' Perhaps you need to add a use statement for one of the following: %s.', implode(', ', $classes));
+ if ($candidates = $this->getClassCandidates($className)) {
+ $tail = array_pop($candidates).'"?';
+ if ($candidates) {
+ $tail = ' for e.g. "'.implode('", "', $candidates).'" or "'.$tail;
+ } else {
+ $tail = ' for "'.$tail;
+ }
}
+ $message .= "\nDid you forget a \"use\" statement".$tail;
return new ClassNotFoundException($message, $exception);
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
index f460c66f8e2029f401d52b43089973838e987219..c6f391a79c686fe86a3538ec0b98ddb975b30816 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -47,21 +47,10 @@ public function handleError(array $error, FatalErrorException $exception)
if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedFunctionName, '\\')) {
$functionName = substr($fullyQualifiedFunctionName, $namespaceSeparatorIndex + 1);
$namespacePrefix = substr($fullyQualifiedFunctionName, 0, $namespaceSeparatorIndex);
- $message = sprintf(
- 'Attempted to call function "%s" from namespace "%s" in %s line %d.',
- $functionName,
- $namespacePrefix,
- $error['file'],
- $error['line']
- );
+ $message = sprintf('Attempted to call function "%s" from namespace "%s".', $functionName, $namespacePrefix);
} else {
$functionName = $fullyQualifiedFunctionName;
- $message = sprintf(
- 'Attempted to call function "%s" from the global namespace in %s line %d.',
- $functionName,
- $error['file'],
- $error['line']
- );
+ $message = sprintf('Attempted to call function "%s" from the global namespace.', $functionName);
}
$candidates = array();
@@ -81,9 +70,13 @@ public function handleError(array $error, FatalErrorException $exception)
if ($candidates) {
sort($candidates);
- $message .= ' Did you mean to call: '.implode(', ', array_map(function ($val) {
- return '"'.$val.'"';
- }, $candidates)).'?';
+ $last = array_pop($candidates).'"?';
+ if ($candidates) {
+ $candidates = 'e.g. "'.implode('", "', $candidates).'" or "'.$last;
+ } else {
+ $candidates = '"'.$last;
+ }
+ $message .= "\nDid you mean to call ".$candidates;
}
return new UndefinedFunctionException($message, $exception);
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
index 7cc55c6b06f5a7fa8196977862c17ecab00ee84b..917794cfa0c017d2b887cb297a32c90941cddeb5 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -34,7 +34,7 @@ public function handleError(array $error, FatalErrorException $exception)
$className = $matches[1];
$methodName = $matches[2];
- $message = sprintf('Attempted to call method "%s" on class "%s" in %s line %d.', $methodName, $className, $error['file'], $error['line']);
+ $message = sprintf('Attempted to call method "%s" on class "%s".', $methodName, $className);
$candidates = array();
foreach (get_class_methods($className) as $definedMethodName) {
@@ -46,7 +46,13 @@ public function handleError(array $error, FatalErrorException $exception)
if ($candidates) {
sort($candidates);
- $message .= sprintf(' Did you mean to call: "%s"?', implode('", "', $candidates));
+ $last = array_pop($candidates).'"?';
+ if ($candidates) {
+ $candidates = 'e.g. "'.implode('", "', $candidates).'" or "'.$last;
+ } else {
+ $candidates = '"'.$last;
+ }
+ $message .= "\nDid you mean to call ".$candidates;
}
return new UndefinedMethodException($message, $exception);
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/README.md b/core/vendor/symfony/debug/Symfony/Component/Debug/README.md
index dd5bdca6bff61216efcca97bd67ef310649c671c..18d6d8f9eeecc6b35d82dbf54e06ce0bad23cac0 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/README.md
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/README.md
@@ -6,23 +6,26 @@ Debug provides tools to make debugging easier.
Enabling all debug tools is as easy as calling the `enable()` method on the
main `Debug` class:
- use Symfony\Component\Debug\Debug;
+```php
+use Symfony\Component\Debug\Debug;
- Debug::enable();
+Debug::enable();
+```
You can also use the tools individually:
- use Symfony\Component\Debug\ErrorHandler;
- use Symfony\Component\Debug\ExceptionHandler;
-
- error_reporting(-1);
-
- ErrorHandler::register($errorReportingLevel);
- if ('cli' !== php_sapi_name()) {
- ExceptionHandler::register();
- } elseif (!ini_get('log_errors') || ini_get('error_log')) {
- ini_set('display_errors', 1);
- }
+```php
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\ExceptionHandler;
+
+if ('cli' !== php_sapi_name()) {
+ ini_set('display_errors', 0);
+ ExceptionHandler::register();
+} elseif (!ini_get('log_errors') || ini_get('error_log')) {
+ ini_set('display_errors', 1);
+}
+ErrorHandler::register($errorReportingLevel);
+```
Note that the `Debug::enable()` call also registers the debug class loader
from the Symfony ClassLoader component when available.
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst
new file mode 100644
index 0000000000000000000000000000000000000000..b0d1c58959fc986afa89c41dd4899609d68a9967
--- /dev/null
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst
@@ -0,0 +1,72 @@
+Symfony Debug Extension
+=======================
+
+This extension adds a ``symfony_zval_info($key, $array, $options = 0)`` function that:
+
+- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
+- does work with references, preventing memory copying.
+
+Its behavior is about the same as:
+
+.. code-block:: php
+
+ <?php
+
+ function symfony_zval_info($key, $array, $options = 0)
+ {
+ // $options is currently not used, but could be in future version.
+
+ if (!array_key_exists($key, $array)) {
+ return null;
+ }
+
+ $info = array(
+ 'type' => gettype($array[$key]),
+ 'zval_hash' => /* hashed memory address of $array[$key] */,
+ 'zval_refcount' => /* internal zval refcount of $array[$key] */,
+ 'zval_isref' => /* is_ref status of $array[$key] */,
+ );
+
+ switch ($info['type']) {
+ case 'object':
+ $info += array(
+ 'object_class' => get_class($array[$key]),
+ 'object_refcount' => /* internal object refcount of $array[$key] */,
+ 'object_hash' => spl_object_hash($array[$key]),
+ 'object_handle' => /* internal object handle $array[$key] */,
+ );
+ break;
+
+ case 'resource':
+ $info += array(
+ 'resource_handle' => (int) $array[$key],
+ 'resource_type' => get_resource_type($array[$key]),
+ 'resource_refcount' => /* internal resource refcount of $array[$key] */,
+ );
+ break;
+
+ case 'array':
+ $info += array(
+ 'array_count' => count($array[$key]),
+ );
+ break;
+
+ case 'string':
+ $info += array(
+ 'strlen' => strlen($array[$key]),
+ );
+ break;
+ }
+
+ return $info;
+ }
+
+To enable the extension from source, run:
+
+.. code-block:: sh
+
+ phpize
+ ./configure
+ make
+ sudo make install
+
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.m4 b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.m4
new file mode 100644
index 0000000000000000000000000000000000000000..3c56047150569b5ad02799e03f7b7edfbee5d608
--- /dev/null
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.m4
@@ -0,0 +1,63 @@
+dnl $Id$
+dnl config.m4 for extension symfony_debug
+
+dnl Comments in this file start with the string 'dnl'.
+dnl Remove where necessary. This file will not work
+dnl without editing.
+
+dnl If your extension references something external, use with:
+
+dnl PHP_ARG_WITH(symfony_debug, for symfony_debug support,
+dnl Make sure that the comment is aligned:
+dnl [ --with-symfony_debug Include symfony_debug support])
+
+dnl Otherwise use enable:
+
+PHP_ARG_ENABLE(symfony_debug, whether to enable symfony_debug support,
+dnl Make sure that the comment is aligned:
+[ --enable-symfony_debug Enable symfony_debug support])
+
+if test "$PHP_SYMFONY_DEBUG" != "no"; then
+ dnl Write more examples of tests here...
+
+ dnl # --with-symfony_debug -> check with-path
+ dnl SEARCH_PATH="/usr/local /usr" # you might want to change this
+ dnl SEARCH_FOR="/include/symfony_debug.h" # you most likely want to change this
+ dnl if test -r $PHP_SYMFONY_DEBUG/$SEARCH_FOR; then # path given as parameter
+ dnl SYMFONY_DEBUG_DIR=$PHP_SYMFONY_DEBUG
+ dnl else # search default path list
+ dnl AC_MSG_CHECKING([for symfony_debug files in default path])
+ dnl for i in $SEARCH_PATH ; do
+ dnl if test -r $i/$SEARCH_FOR; then
+ dnl SYMFONY_DEBUG_DIR=$i
+ dnl AC_MSG_RESULT(found in $i)
+ dnl fi
+ dnl done
+ dnl fi
+ dnl
+ dnl if test -z "$SYMFONY_DEBUG_DIR"; then
+ dnl AC_MSG_RESULT([not found])
+ dnl AC_MSG_ERROR([Please reinstall the symfony_debug distribution])
+ dnl fi
+
+ dnl # --with-symfony_debug -> add include path
+ dnl PHP_ADD_INCLUDE($SYMFONY_DEBUG_DIR/include)
+
+ dnl # --with-symfony_debug -> check for lib and symbol presence
+ dnl LIBNAME=symfony_debug # you may want to change this
+ dnl LIBSYMBOL=symfony_debug # you most likely want to change this
+
+ dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
+ dnl [
+ dnl PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SYMFONY_DEBUG_DIR/lib, SYMFONY_DEBUG_SHARED_LIBADD)
+ dnl AC_DEFINE(HAVE_SYMFONY_DEBUGLIB,1,[ ])
+ dnl ],[
+ dnl AC_MSG_ERROR([wrong symfony_debug lib version or lib not found])
+ dnl ],[
+ dnl -L$SYMFONY_DEBUG_DIR/lib -lm
+ dnl ])
+ dnl
+ dnl PHP_SUBST(SYMFONY_DEBUG_SHARED_LIBADD)
+
+ PHP_NEW_EXTENSION(symfony_debug, symfony_debug.c, $ext_shared)
+fi
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.w32 b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.w32
new file mode 100644
index 0000000000000000000000000000000000000000..487e6913891cf07b60f9779b0e3ffd18406c44ff
--- /dev/null
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.w32
@@ -0,0 +1,13 @@
+// $Id$
+// vim:ft=javascript
+
+// If your extension references something external, use ARG_WITH
+// ARG_WITH("symfony_debug", "for symfony_debug support", "no");
+
+// Otherwise, use ARG_ENABLE
+// ARG_ENABLE("symfony_debug", "enable symfony_debug support", "no");
+
+if (PHP_SYMFONY_DEBUG != "no") {
+ EXTENSION("symfony_debug", "symfony_debug.c");
+}
+
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/php_symfony_debug.h b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/php_symfony_debug.h
new file mode 100644
index 0000000000000000000000000000000000000000..c935f670192994ae698a68d541e9c6147970871b
--- /dev/null
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/php_symfony_debug.h
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+#ifndef PHP_SYMFONY_DEBUG_H
+#define PHP_SYMFONY_DEBUG_H
+
+extern zend_module_entry symfony_debug_module_entry;
+#define phpext_symfony_debug_ptr &symfony_debug_module_entry
+
+#define PHP_SYMFONY_DEBUG_VERSION "1.0"
+
+#ifdef PHP_WIN32
+# define PHP_SYMFONY_DEBUG_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_SYMFONY_DEBUG_API __attribute__ ((visibility("default")))
+#else
+# define PHP_SYMFONY_DEBUG_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+ZEND_BEGIN_MODULE_GLOBALS(symfony_debug)
+ intptr_t req_rand_init;
+ZEND_END_MODULE_GLOBALS(symfony_debug)
+
+PHP_MINIT_FUNCTION(symfony_debug);
+PHP_MSHUTDOWN_FUNCTION(symfony_debug);
+PHP_RINIT_FUNCTION(symfony_debug);
+PHP_RSHUTDOWN_FUNCTION(symfony_debug);
+PHP_MINFO_FUNCTION(symfony_debug);
+PHP_GINIT_FUNCTION(symfony_debug);
+PHP_GSHUTDOWN_FUNCTION(symfony_debug);
+
+PHP_FUNCTION(symfony_zval_info);
+
+static char *_symfony_debug_memory_address_hash(void *);
+static const char *_symfony_debug_zval_type(zval *);
+static const char* _symfony_debug_get_resource_type(long);
+static int _symfony_debug_get_resource_refcount(long);
+
+#ifdef ZTS
+#define SYMFONY_DEBUG_G(v) TSRMG(symfony_debug_globals_id, zend_symfony_debug_globals *, v)
+#else
+#define SYMFONY_DEBUG_G(v) (symfony_debug_globals.v)
+#endif
+
+#endif /* PHP_SYMFONY_DEBUG_H */
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/symfony_debug.c b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/symfony_debug.c
new file mode 100644
index 0000000000000000000000000000000000000000..8dc5d4356a81919fb063ab255b865c935b569a80
--- /dev/null
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/symfony_debug.c
@@ -0,0 +1,224 @@
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_symfony_debug.h"
+#include "ext/standard/php_rand.h"
+#include "ext/standard/php_lcg.h"
+#include "ext/spl/php_spl.h"
+#include "Zend/zend_gc.h"
+
+ZEND_DECLARE_MODULE_GLOBALS(symfony_debug)
+
+ZEND_BEGIN_ARG_INFO_EX(symfony_zval_arginfo, 0, 0, 2)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_ARRAY_INFO(0, array, 0)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+const zend_function_entry symfony_debug_functions[] = {
+ PHP_FE(symfony_zval_info, symfony_zval_arginfo)
+ PHP_FE_END
+};
+
+PHP_FUNCTION(symfony_zval_info)
+{
+ zval *key = NULL, *arg = NULL;
+ zval **data = NULL;
+ HashTable *array = NULL;
+ long options = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "zh|l", &key, &array, &options) == FAILURE) {
+ return;
+ }
+
+ switch (Z_TYPE_P(key)) {
+ case IS_STRING:
+ if (zend_symtable_find(array, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&data) == FAILURE) {
+ return;
+ }
+ break;
+ case IS_LONG:
+ if (zend_hash_index_find(array, Z_LVAL_P(key), (void **)&data)) {
+ return;
+ }
+ break;
+ }
+
+ arg = *data;
+
+ array_init(return_value);
+
+ add_assoc_string(return_value, "type", (char *)_symfony_debug_zval_type(arg), 1);
+ add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg), 16, 1);
+ add_assoc_long(return_value, "zval_refcount", Z_REFCOUNT_P(arg));
+ add_assoc_bool(return_value, "zval_isref", (zend_bool)Z_ISREF_P(arg));
+
+ if (Z_TYPE_P(arg) == IS_OBJECT) {
+ static char hash[33] = {0};
+ php_spl_object_hash(arg, (char *)hash);
+ add_assoc_stringl(return_value, "object_class", (char *)Z_OBJCE_P(arg)->name, Z_OBJCE_P(arg)->name_length, 1);
+ add_assoc_long(return_value, "object_refcount", EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(arg)].bucket.obj.refcount);
+ add_assoc_string(return_value, "object_hash", hash, 1);
+ add_assoc_long(return_value, "object_handle", Z_OBJ_HANDLE_P(arg));
+ } else if (Z_TYPE_P(arg) == IS_ARRAY) {
+ add_assoc_long(return_value, "array_count", zend_hash_num_elements(Z_ARRVAL_P(arg)));
+ } else if(Z_TYPE_P(arg) == IS_RESOURCE) {
+ add_assoc_long(return_value, "resource_handle", Z_LVAL_P(arg));
+ add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg)), 1);
+ add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg)));
+ } else if (Z_TYPE_P(arg) == IS_STRING) {
+ add_assoc_long(return_value, "strlen", Z_STRLEN_P(arg));
+ }
+}
+
+static const char* _symfony_debug_get_resource_type(long rsid)
+{
+ const char *res_type;
+ res_type = zend_rsrc_list_get_rsrc_type(rsid);
+
+ if (!res_type) {
+ return "Unknown";
+ }
+
+ return res_type;
+}
+
+static int _symfony_debug_get_resource_refcount(long rsid)
+{
+ zend_rsrc_list_entry *le;
+
+ if (zend_hash_index_find(&EG(regular_list), rsid, (void **) &le)==SUCCESS) {
+ return le->refcount;
+ }
+
+ return 0;
+}
+
+static char *_symfony_debug_memory_address_hash(void *address)
+{
+ static char result[17] = {0};
+ intptr_t address_rand;
+
+ if (!SYMFONY_DEBUG_G(req_rand_init)) {
+ if (!BG(mt_rand_is_seeded)) {
+ php_mt_srand(GENERATE_SEED() TSRMLS_CC);
+ }
+ SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand();
+ }
+
+ address_rand = (intptr_t)address ^ SYMFONY_DEBUG_G(req_rand_init);
+
+ snprintf(result, 17, "%016zx", address_rand);
+
+ return result;
+}
+
+static const char *_symfony_debug_zval_type(zval *zv)
+{
+ switch (Z_TYPE_P(zv)) {
+ case IS_NULL:
+ return "NULL";
+ break;
+
+ case IS_BOOL:
+ return "boolean";
+ break;
+
+ case IS_LONG:
+ return "integer";
+ break;
+
+ case IS_DOUBLE:
+ return "double";
+ break;
+
+ case IS_STRING:
+ return "string";
+ break;
+
+ case IS_ARRAY:
+ return "array";
+ break;
+
+ case IS_OBJECT:
+ return "object";
+
+ case IS_RESOURCE:
+ return "resource";
+
+ default:
+ return "unknown type";
+ }
+}
+
+zend_module_entry symfony_debug_module_entry = {
+ STANDARD_MODULE_HEADER,
+ "symfony_debug",
+ symfony_debug_functions,
+ PHP_MINIT(symfony_debug),
+ PHP_MSHUTDOWN(symfony_debug),
+ PHP_RINIT(symfony_debug),
+ PHP_RSHUTDOWN(symfony_debug),
+ PHP_MINFO(symfony_debug),
+ PHP_SYMFONY_DEBUG_VERSION,
+ PHP_MODULE_GLOBALS(symfony_debug),
+ PHP_GINIT(symfony_debug),
+ PHP_GSHUTDOWN(symfony_debug),
+ NULL,
+ STANDARD_MODULE_PROPERTIES_EX
+};
+
+#ifdef COMPILE_DL_SYMFONY_DEBUG
+ZEND_GET_MODULE(symfony_debug)
+#endif
+
+PHP_GINIT_FUNCTION(symfony_debug)
+{
+ symfony_debug_globals->req_rand_init = 0;
+}
+
+PHP_GSHUTDOWN_FUNCTION(symfony_debug)
+{
+
+}
+
+PHP_MINIT_FUNCTION(symfony_debug)
+{
+ return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(symfony_debug)
+{
+ return SUCCESS;
+}
+
+PHP_RINIT_FUNCTION(symfony_debug)
+{
+ return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(symfony_debug)
+{
+ return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(symfony_debug)
+{
+ php_info_print_table_start();
+ php_info_print_table_header(2, "Symfony Debug support", "enabled");
+ php_info_print_table_header(2, "Symfony Debug version", PHP_SYMFONY_DEBUG_VERSION);
+ php_info_print_table_end();
+}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/tests/001.phpt b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/tests/001.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..30b25a25e22383b7313d5c531b24ed60c46d442b
--- /dev/null
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/tests/001.phpt
@@ -0,0 +1,151 @@
+--TEST--
+Test symfony_zval_info API
+--SKIPIF--
+<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+--FILE--
+<?php
+
+$int = 42;
+$float = 42.42;
+$str = "foobar";
+$object = new StdClass;
+$array = array('foo', 'bar');
+$resource = tmpfile();
+$null = null;
+$bool = true;
+
+$anotherint = 42;
+$refcount2 = &$anotherint;
+
+$var = array('int' => $int,
+ 'float' => $float,
+ 'str' => $str,
+ 'object' => $object,
+ 'array' => $array,
+ 'resource' => $resource,
+ 'null' => $null,
+ 'bool' => $bool,
+ 'refcount' => &$refcount2);
+
+var_dump(symfony_zval_info('int', $var));
+var_dump(symfony_zval_info('float', $var));
+var_dump(symfony_zval_info('str', $var));
+var_dump(symfony_zval_info('object', $var));
+var_dump(symfony_zval_info('array', $var));
+var_dump(symfony_zval_info('resource', $var));
+var_dump(symfony_zval_info('null', $var));
+var_dump(symfony_zval_info('bool', $var));
+
+var_dump(symfony_zval_info('refcount', $var));
+var_dump(symfony_zval_info('not-exist', $var));
+?>
+--EXPECTF--
+array(4) {
+ ["type"]=>
+ string(7) "integer"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+}
+array(4) {
+ ["type"]=>
+ string(6) "double"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+}
+array(5) {
+ ["type"]=>
+ string(6) "string"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+ ["strlen"]=>
+ int(6)
+}
+array(8) {
+ ["type"]=>
+ string(6) "object"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+ ["object_class"]=>
+ string(8) "stdClass"
+ ["object_refcount"]=>
+ int(1)
+ ["object_hash"]=>
+ string(32) "%s"
+ ["object_handle"]=>
+ int(1)
+}
+array(5) {
+ ["type"]=>
+ string(5) "array"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+ ["array_count"]=>
+ int(2)
+}
+array(7) {
+ ["type"]=>
+ string(8) "resource"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+ ["resource_handle"]=>
+ int(4)
+ ["resource_type"]=>
+ string(6) "stream"
+ ["resource_refcount"]=>
+ int(1)
+}
+array(4) {
+ ["type"]=>
+ string(4) "NULL"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+}
+array(4) {
+ ["type"]=>
+ string(7) "boolean"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(2)
+ ["zval_isref"]=>
+ bool(false)
+}
+array(4) {
+ ["type"]=>
+ string(7) "integer"
+ ["zval_hash"]=>
+ string(16) "%s"
+ ["zval_refcount"]=>
+ int(3)
+ ["zval_isref"]=>
+ bool(true)
+}
+NULL
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
index 396cc98ee9b756bc9c90ff33e59dee33c7e30919..dd962d3c79001d20df6f9fb16f2bb956834dbe15 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -106,11 +106,11 @@ class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
$this->assertEquals(E_STRICT, $exception->getSeverity());
$this->assertStringStartsWith(__FILE__, $exception->getFile());
$this->assertRegexp('/^Runtime Notice: Declaration/', $exception->getMessage());
- } catch (\Exception $e) {
+ } catch (\Exception $exception) {
restore_error_handler();
restore_exception_handler();
- throw $e;
+ throw $exception;
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
index 603e0d59ae53c11d92e6c08d66a1e97db5fb3915..97eb3d7a4e9a9a7aa0966ee66b0bcd8d0b4637ae 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Debug\Tests;
+use Psr\Log\LogLevel;
use Symfony\Component\Debug\ErrorHandler;
use Symfony\Component\Debug\Exception\ContextErrorException;
@@ -18,6 +19,7 @@
* ErrorHandlerTest
*
* @author Robert Schönthal <seroscho@googlemail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
*/
class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
{
@@ -44,6 +46,46 @@ public function tearDown()
error_reporting($this->errorReporting);
}
+ public function testRegister()
+ {
+ $handler = ErrorHandler::register();
+
+ try {
+ $this->assertInstanceOf('Symfony\Component\Debug\ErrorHandler', $handler);
+ $this->assertSame($handler, ErrorHandler::register());
+
+ $newHandler = new ErrorHandler();
+
+ $this->assertSame($newHandler, ErrorHandler::register($newHandler, false));
+ $h = set_error_handler('var_dump');
+ restore_error_handler();
+ $this->assertSame(array($handler, 'handleError'), $h);
+
+ try {
+ $this->assertSame($newHandler, ErrorHandler::register($newHandler, true));
+ $h = set_error_handler('var_dump');
+ restore_error_handler();
+ $this->assertSame(array($newHandler, 'handleError'), $h);
+ } catch (\Exception $e) {
+ }
+
+ restore_error_handler();
+ restore_exception_handler();
+
+ if (isset($e)) {
+ throw $e;
+ }
+ } catch (\Exception $e) {
+ }
+
+ restore_error_handler();
+ restore_exception_handler();
+
+ if (isset($e)) {
+ throw $e;
+ }
+ }
+
public function testNotice()
{
ErrorHandler::register();
@@ -54,6 +96,8 @@ public function testNotice()
} catch (ContextErrorException $exception) {
// if an exception is thrown, the test passed
restore_error_handler();
+ restore_exception_handler();
+
$this->assertEquals(E_NOTICE, $exception->getSeverity());
$this->assertEquals(__FILE__, $exception->getFile());
$this->assertRegexp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
@@ -62,7 +106,7 @@ public function testNotice()
$trace = $exception->getTrace();
$this->assertEquals(__FILE__, $trace[0]['file']);
$this->assertEquals('Symfony\Component\Debug\ErrorHandler', $trace[0]['class']);
- $this->assertEquals('handle', $trace[0]['function']);
+ $this->assertEquals('handleError', $trace[0]['function']);
$this->assertEquals('->', $trace[0]['type']);
$this->assertEquals(__FILE__, $trace[1]['file']);
@@ -70,16 +114,16 @@ public function testNotice()
$this->assertEquals('triggerNotice', $trace[1]['function']);
$this->assertEquals('::', $trace[1]['type']);
+ $this->assertEquals(__FILE__, $trace[1]['file']);
$this->assertEquals(__CLASS__, $trace[2]['class']);
- $this->assertEquals('testNotice', $trace[2]['function']);
+ $this->assertEquals(__FUNCTION__, $trace[2]['function']);
$this->assertEquals('->', $trace[2]['type']);
} catch (\Exception $e) {
restore_error_handler();
+ restore_exception_handler();
throw $e;
}
-
- restore_error_handler();
}
// dummy function to test trace in error handler.
@@ -93,78 +137,128 @@ private static function triggerNotice($that)
public function testConstruct()
{
try {
- $handler = ErrorHandler::register(3);
+ $handler = ErrorHandler::register();
+ $handler->throwAt(3, true);
+ $this->assertEquals(3 | E_RECOVERABLE_ERROR | E_USER_ERROR, $handler->throwAt(0));
+
+ restore_error_handler();
+ restore_exception_handler();
+ } catch (\Exception $e) {
+ restore_error_handler();
+ restore_exception_handler();
+
+ throw $e;
+ }
+ }
+
+ public function testDefaultLogger()
+ {
+ try {
+ $handler = ErrorHandler::register();
- $level = new \ReflectionProperty($handler, 'level');
- $level->setAccessible(true);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
- $this->assertEquals(3, $level->getValue($handler));
+ $handler->setDefaultLogger($logger, E_NOTICE);
+ $handler->setDefaultLogger($logger, array(E_USER_NOTICE => LogLevel::CRITICAL));
+
+ $loggers = array(
+ E_DEPRECATED => array(null, LogLevel::INFO),
+ E_USER_DEPRECATED => array(null, LogLevel::INFO),
+ E_NOTICE => array($logger, LogLevel::NOTICE),
+ E_USER_NOTICE => array($logger, LogLevel::CRITICAL),
+ E_STRICT => array(null, LogLevel::NOTICE),
+ E_WARNING => array(null, LogLevel::WARNING),
+ E_USER_WARNING => array(null, LogLevel::WARNING),
+ E_COMPILE_WARNING => array(null, LogLevel::WARNING),
+ E_CORE_WARNING => array(null, LogLevel::WARNING),
+ E_USER_ERROR => array(null, LogLevel::ERROR),
+ E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
+ E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
+ E_PARSE => array(null, LogLevel::EMERGENCY),
+ E_ERROR => array(null, LogLevel::EMERGENCY),
+ E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
+ );
+ $this->assertSame($loggers, $handler->setLoggers(array()));
restore_error_handler();
+ restore_exception_handler();
} catch (\Exception $e) {
restore_error_handler();
+ restore_exception_handler();
throw $e;
}
}
- public function testHandle()
+ public function testHandleError()
{
try {
- $handler = ErrorHandler::register(0);
- $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, array()));
+ $handler = ErrorHandler::register();
+ $handler->throwAt(0, true);
+ $this->assertFalse($handler->handleError(0, 'foo', 'foo.php', 12, array()));
restore_error_handler();
+ restore_exception_handler();
- $handler = ErrorHandler::register(3);
- $this->assertFalse($handler->handle(4, 'foo', 'foo.php', 12, array()));
+ $handler = ErrorHandler::register();
+ $handler->throwAt(3, true);
+ $this->assertFalse($handler->handleError(4, 'foo', 'foo.php', 12, array()));
restore_error_handler();
+ restore_exception_handler();
- $handler = ErrorHandler::register(3);
+ $handler = ErrorHandler::register();
+ $handler->throwAt(3, true);
try {
- $handler->handle(111, 'foo', 'foo.php', 12, array());
+ $handler->handleError(4, 'foo', 'foo.php', 12, array());
} catch (\ErrorException $e) {
- $this->assertSame('111: foo in foo.php line 12', $e->getMessage());
- $this->assertSame(111, $e->getSeverity());
+ $this->assertSame('Parse Error: foo', $e->getMessage());
+ $this->assertSame(4, $e->getSeverity());
$this->assertSame('foo.php', $e->getFile());
$this->assertSame(12, $e->getLine());
}
restore_error_handler();
+ restore_exception_handler();
- $handler = ErrorHandler::register(E_USER_DEPRECATED);
- $this->assertFalse($handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
+ $handler = ErrorHandler::register();
+ $handler->throwAt(E_USER_DEPRECATED, true);
+ $this->assertFalse($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
restore_error_handler();
+ restore_exception_handler();
- $handler = ErrorHandler::register(E_DEPRECATED);
- $this->assertFalse($handler->handle(E_DEPRECATED, 'foo', 'foo.php', 12, array()));
+ $handler = ErrorHandler::register();
+ $handler->throwAt(E_DEPRECATED, true);
+ $this->assertFalse($handler->handleError(E_DEPRECATED, 'foo', 'foo.php', 12, array()));
restore_error_handler();
+ restore_exception_handler();
$logger = $this->getMock('Psr\Log\LoggerInterface');
$that = $this;
- $warnArgCheck = function ($message, $context) use ($that) {
+ $warnArgCheck = function ($logLevel, $message, $context) use ($that) {
+ $that->assertEquals('info', $logLevel);
$that->assertEquals('foo', $message);
$that->assertArrayHasKey('type', $context);
- $that->assertEquals($context['type'], ErrorHandler::TYPE_DEPRECATION);
+ $that->assertEquals($context['type'], E_USER_DEPRECATED);
$that->assertArrayHasKey('stack', $context);
$that->assertInternalType('array', $context['stack']);
};
$logger
->expects($this->once())
- ->method('warning')
+ ->method('log')
->will($this->returnCallback($warnArgCheck))
;
- $handler = ErrorHandler::register(E_USER_DEPRECATED);
- $handler->setLogger($logger);
- $this->assertTrue($handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
+ $handler = ErrorHandler::register();
+ $handler->setDefaultLogger($logger, E_USER_DEPRECATED);
+ $this->assertTrue($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
restore_error_handler();
+ restore_exception_handler();
$logger = $this->getMock('Psr\Log\LoggerInterface');
@@ -181,69 +275,147 @@ public function testHandle()
->will($this->returnCallback($logArgCheck))
;
- $handler = ErrorHandler::register(E_NOTICE);
- $handler->setLogger($logger, 'scream');
+ $handler = ErrorHandler::register();
+ $handler->setDefaultLogger($logger, E_NOTICE);
+ $handler->screamAt(E_NOTICE);
unset($undefVar);
@$undefVar++;
restore_error_handler();
+ restore_exception_handler();
} catch (\Exception $e) {
restore_error_handler();
+ restore_exception_handler();
throw $e;
}
}
- /**
- * @dataProvider provideFatalErrorHandlersData
- */
- public function testFatalErrorHandlers($error, $class, $translatedMessage)
+ public function testHandleException()
{
- $handler = new ErrorHandler();
- $exceptionHandler = new MockExceptionHandler();
+ try {
+ $handler = ErrorHandler::register();
- $m = new \ReflectionMethod($handler, 'handleFatalError');
- $m->setAccessible(true);
- $m->invoke($handler, array($exceptionHandler, 'handle'), $error);
+ $exception = new \Exception('foo');
- restore_error_handler();
- $this->assertInstanceof($class, $exceptionHandler->e);
- // class names are case insensitive and PHP/HHVM do not return the same
- $this->assertSame(strtolower($translatedMessage), strtolower($exceptionHandler->e->getMessage()));
- $this->assertSame($error['type'], $exceptionHandler->e->getSeverity());
- $this->assertSame($error['file'], $exceptionHandler->e->getFile());
- $this->assertSame($error['line'], $exceptionHandler->e->getLine());
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
+
+ $that = $this;
+ $logArgCheck = function ($level, $message, $context) use ($that) {
+ $that->assertEquals('Uncaught Exception: foo', $message);
+ $that->assertArrayHasKey('type', $context);
+ $that->assertEquals($context['type'], E_ERROR);
+ };
+
+ $logger
+ ->expects($this->exactly(2))
+ ->method('log')
+ ->will($this->returnCallback($logArgCheck))
+ ;
+
+ $handler->setDefaultLogger($logger, E_ERROR);
+
+ try {
+ $handler->handleException($exception);
+ $this->fail('Exception expected');
+ } catch (\Exception $e) {
+ $this->assertSame($exception, $e);
+ }
+
+ $that = $this;
+ $handler->setExceptionHandler(function ($e) use ($exception, $that) {
+ $that->assertSame($exception, $e);
+ });
+
+ $handler->handleException($exception);
+
+ restore_error_handler();
+ restore_exception_handler();
+ } catch (\Exception $e) {
+ restore_error_handler();
+ restore_exception_handler();
+
+ throw $e;
+ }
}
- public function provideFatalErrorHandlersData()
+ public function testHandleFatalError()
{
- return array(
- // undefined function
- array(
- array(
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined function test_namespaced_function_again()',
- ),
- 'Symfony\Component\Debug\Exception\UndefinedFunctionException',
- 'Attempted to call function "test_namespaced_function_again" from the global namespace in foo.php line 12. Did you mean to call: "\\symfony\\component\\debug\\tests\\test_namespaced_function_again"?',
- ),
- // class not found
- array(
- array(
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'WhizBangFactory\' not found',
- ),
- 'Symfony\Component\Debug\Exception\ClassNotFoundException',
- 'Attempted to load class "WhizBangFactory" from the global namespace in foo.php line 12. Did you forget a use statement for this class?',
- ),
- );
+ try {
+ $handler = ErrorHandler::register();
+
+ $error = array(
+ 'type' => E_PARSE,
+ 'message' => 'foo',
+ 'file' => 'bar',
+ 'line' => 123,
+ );
+
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
+
+ $that = $this;
+ $logArgCheck = function ($level, $message, $context) use ($that) {
+ $that->assertEquals('Fatal Parse Error: foo', $message);
+ $that->assertArrayHasKey('type', $context);
+ $that->assertEquals($context['type'], E_ERROR);
+ };
+
+ $logger
+ ->expects($this->once())
+ ->method('log')
+ ->will($this->returnCallback($logArgCheck))
+ ;
+
+ $handler->setDefaultLogger($logger, E_ERROR);
+
+ $handler->handleFatalError($error);
+
+ restore_error_handler();
+ restore_exception_handler();
+ } catch (\Exception $e) {
+ restore_error_handler();
+ restore_exception_handler();
+
+ throw $e;
+ }
}
-}
-function test_namespaced_function_again()
-{
+ public function testDeprecatedInterface()
+ {
+ try {
+ $handler = ErrorHandler::register(0);
+ $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, array()));
+
+ restore_error_handler();
+ restore_exception_handler();
+
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
+
+ $that = $this;
+ $logArgCheck = function ($level, $message, $context) use ($that) {
+ $that->assertEquals('Undefined variable: undefVar', $message);
+ $that->assertArrayHasKey('type', $context);
+ $that->assertEquals($context['type'], E_NOTICE);
+ };
+
+ $logger
+ ->expects($this->once())
+ ->method('log')
+ ->will($this->returnCallback($logArgCheck))
+ ;
+
+ $handler = ErrorHandler::register(E_NOTICE);
+ $handler->setLogger($logger, 'scream');
+ unset($undefVar);
+ @$undefVar++;
+
+ restore_error_handler();
+ restore_exception_handler();
+ } catch (\Exception $e) {
+ restore_error_handler();
+ restore_exception_handler();
+
+ throw $e;
+ }
+ }
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
index 0c0f42d80b5142cb8cab9cfda4f9bf9d4fc0d3de..df95d8dfd527656ec9c1e893460298ac3666b782 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
@@ -162,8 +162,8 @@ public function testToArray(\Exception $exception, $statusCode)
'message' => 'test',
'class' => 'Exception',
'trace' => array(array(
- 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '', 'file' => 'foo.php', 'line' => 123,
- 'args' => array(),
+ 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '', 'file' => 'foo.php', 'line' => 123,
+ 'args' => array(),
)),
),
), $flattened->toArray());
@@ -214,14 +214,14 @@ public function testSetTraceIncompleteClass()
'class' => 'Exception',
'trace' => array(
array(
- 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '',
- 'file' => 'foo.php', 'line' => 123,
- 'args' => array(),
+ 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '',
+ 'file' => 'foo.php', 'line' => 123,
+ 'args' => array(),
),
array(
- 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => 'test',
- 'file' => __FILE__, 'line' => 123,
- 'args' => array(
+ 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => 'test',
+ 'file' => __FILE__, 'line' => 123,
+ 'args' => array(
array(
'incomplete-object', 'BogusTestClass',
),
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
index b202b8f1dec22c1a2c5a9e086e1bf59c6af55678..26f889288ff93221d38dbf18c17c98c9c04bf44b 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
@@ -12,6 +12,8 @@
namespace Symfony\Component\Debug\Tests;
use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\Debug\Exception\OutOfMemoryException;
+use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
@@ -23,13 +25,13 @@ public function testDebug()
$response = $handler->createResponse(new \RuntimeException('Foo'));
$this->assertContains('<h1>Whoops, looks like something went wrong.</h1>', $response->getContent());
- $this->assertNotContains('<div class="block_exception clear_fix">', $response->getContent());
+ $this->assertNotContains('<h2 class="block_exception clear_fix">', $response->getContent());
$handler = new ExceptionHandler(true);
$response = $handler->createResponse(new \RuntimeException('Foo'));
$this->assertContains('<h1>Whoops, looks like something went wrong.</h1>', $response->getContent());
- $this->assertContains('<div class="block_exception clear_fix">', $response->getContent());
+ $this->assertContains('<h2 class="block_exception clear_fix">', $response->getContent());
}
public function testStatusCode()
@@ -59,4 +61,56 @@ public function testNestedExceptions()
$handler = new ExceptionHandler(true);
$response = $handler->createResponse(new \RuntimeException('Foo', 0, new \RuntimeException('Bar')));
}
+
+ public function testHandle()
+ {
+ $exception = new \Exception('foo');
+
+ if (class_exists('Symfony\Component\HttpFoundation\Response')) {
+ $handler = $this->getMock('Symfony\Component\Debug\ExceptionHandler', array('createResponse'));
+ $handler
+ ->expects($this->exactly(2))
+ ->method('createResponse')
+ ->will($this->returnValue(new Response()));
+ } else {
+ $handler = $this->getMock('Symfony\Component\Debug\ExceptionHandler', array('sendPhpResponse'));
+ $handler
+ ->expects($this->exactly(2))
+ ->method('sendPhpResponse');
+ }
+
+ $handler->handle($exception);
+
+ $that = $this;
+ $handler->setHandler(function ($e) use ($exception, $that) {
+ $that->assertSame($exception, $e);
+ });
+
+ $handler->handle($exception);
+ }
+
+ public function testHandleOutOfMemoryException()
+ {
+ $exception = new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__);
+
+ if (class_exists('Symfony\Component\HttpFoundation\Response')) {
+ $handler = $this->getMock('Symfony\Component\Debug\ExceptionHandler', array('createResponse'));
+ $handler
+ ->expects($this->once())
+ ->method('createResponse')
+ ->will($this->returnValue(new Response()));
+ } else {
+ $handler = $this->getMock('Symfony\Component\Debug\ExceptionHandler', array('sendPhpResponse'));
+ $handler
+ ->expects($this->once())
+ ->method('sendPhpResponse');
+ }
+
+ $that = $this;
+ $handler->setHandler(function ($e) use ($that) {
+ $that->fail('OutOfMemoryException should bypass the handler');
+ });
+
+ $handler->handle($exception);
+ }
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
index be6c74af9c1d0da87114537f67df253b31b8df26..0dbb7b2fdd9ff8d641883eb59f4ef99dcea3f991 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -41,7 +41,7 @@ public function provideClassNotFoundData()
'file' => 'foo.php',
'message' => 'Class \'WhizBangFactory\' not found',
),
- 'Attempted to load class "WhizBangFactory" from the global namespace in foo.php line 12. Did you forget a use statement for this class?',
+ "Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
),
array(
array(
@@ -50,7 +50,7 @@ public function provideClassNotFoundData()
'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
),
- 'Attempted to load class "WhizBangFactory" from namespace "Foo\\Bar" in foo.php line 12. Do you need to "use" it from another namespace?',
+ "Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
),
array(
array(
@@ -59,7 +59,7 @@ public function provideClassNotFoundData()
'file' => 'foo.php',
'message' => 'Class \'UndefinedFunctionException\' not found',
),
- 'Attempted to load class "UndefinedFunctionException" from the global namespace in foo.php line 12. Did you forget a use statement for this class? Perhaps you need to add a use statement for one of the following: Symfony\Component\Debug\Exception\UndefinedFunctionException.',
+ "Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
),
array(
array(
@@ -68,7 +68,7 @@ public function provideClassNotFoundData()
'file' => 'foo.php',
'message' => 'Class \'PEARClass\' not found',
),
- 'Attempted to load class "PEARClass" from the global namespace in foo.php line 12. Did you forget a use statement for this class? Perhaps you need to add a use statement for one of the following: Symfony_Component_Debug_Tests_Fixtures_PEARClass.',
+ "Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"?",
),
array(
array(
@@ -77,7 +77,7 @@ public function provideClassNotFoundData()
'file' => 'foo.php',
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
),
- 'Attempted to load class "UndefinedFunctionException" from namespace "Foo\Bar" in foo.php line 12. Do you need to "use" it from another namespace? Perhaps you need to add a use statement for one of the following: Symfony\Component\Debug\Exception\UndefinedFunctionException.',
+ "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
),
);
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
index 27d50ff86f5834547b9b7ac15cfb8af2317e0f5c..ffe9edb062f5a996e355d9d60686417fce6568d4 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -42,7 +42,7 @@ public function provideUndefinedFunctionData()
'file' => 'foo.php',
'message' => 'Call to undefined function test_namespaced_function()',
),
- 'Attempted to call function "test_namespaced_function" from the global namespace in foo.php line 12. Did you mean to call: "\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function"?',
+ "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
),
array(
array(
@@ -51,7 +51,7 @@ public function provideUndefinedFunctionData()
'file' => 'foo.php',
'message' => 'Call to undefined function Foo\\Bar\\Baz\\test_namespaced_function()',
),
- 'Attempted to call function "test_namespaced_function" from namespace "Foo\\Bar\\Baz" in foo.php line 12. Did you mean to call: "\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function"?',
+ "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
),
array(
array(
@@ -60,7 +60,7 @@ public function provideUndefinedFunctionData()
'file' => 'foo.php',
'message' => 'Call to undefined function foo()',
),
- 'Attempted to call function "foo" from the global namespace in foo.php line 12.',
+ 'Attempted to call function "foo" from the global namespace.',
),
array(
array(
@@ -69,7 +69,7 @@ public function provideUndefinedFunctionData()
'file' => 'foo.php',
'message' => 'Call to undefined function Foo\\Bar\\Baz\\foo()',
),
- 'Attempted to call function "foo" from namespace "Foo\Bar\Baz" in foo.php line 12.',
+ 'Attempted to call function "foo" from namespace "Foo\Bar\Baz".',
),
);
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index 8e1893c15f07e27b2dcb7745e082b40c408c7040..7837d1daa67f5bb923afe5c12d40d8a6b000c189 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -41,7 +41,7 @@ public function provideUndefinedMethodData()
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::what()',
),
- 'Attempted to call method "what" on class "SplObjectStorage" in foo.php line 12.',
+ 'Attempted to call method "what" on class "SplObjectStorage".',
),
array(
array(
@@ -50,7 +50,7 @@ public function provideUndefinedMethodData()
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::walid()',
),
- 'Attempted to call method "walid" on class "SplObjectStorage" in foo.php line 12. Did you mean to call: "valid"?',
+ "Attempted to call method \"walid\" on class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
),
array(
array(
@@ -59,7 +59,7 @@ public function provideUndefinedMethodData()
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
),
- 'Attempted to call method "offsetFet" on class "SplObjectStorage" in foo.php line 12. Did you mean to call: "offsetGet", "offsetSet", "offsetUnset"?',
+ "Attempted to call method \"offsetFet\" on class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
),
);
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/composer.json b/core/vendor/symfony/debug/Symfony/Component/Debug/composer.json
index b9cd2d340a36315b69459f17a27f7f84a010af4e..b919aa4fd6cea5541f5807f6c5436fec6fe36a86 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/composer.json
+++ b/core/vendor/symfony/debug/Symfony/Component/Debug/composer.json
@@ -16,7 +16,8 @@
}
],
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "psr/log": "~1.0"
},
"require-dev": {
"symfony/http-kernel": "~2.1",
@@ -33,7 +34,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md
index 5a88e34e47d50c7b88bde2cd6221a736db1c1e8f..b78e440974b2cf0dbaf42d6a5ace1b16674f33f5 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+2.6.0
+-----
+
+ * added new factory syntax and deprecated the old one
+
2.5.0
-----
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
index f488052596a907db91af11b23a3026a8bb496440..3ac471e2ece907357e9391f174d97709f1b8f18d 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -59,7 +59,7 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
public function process(ContainerBuilder $container)
{
$this->container = $container;
- $this->graph = $container->getCompiler()->getServiceReferenceGraph();
+ $this->graph = $container->getCompiler()->getServiceReferenceGraph();
$this->graph->clear();
foreach ($container->getDefinitions() as $id => $definition) {
@@ -81,6 +81,9 @@ public function process(ContainerBuilder $container)
if ($definition->getConfigurator()) {
$this->processArguments(array($definition->getConfigurator()));
}
+ if ($definition->getFactory()) {
+ $this->processArguments(array($definition->getFactory()));
+ }
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index e81110dc0140466454c8ad40042fe3d40b4ac6c5..ca2c62a0a02b0192b79023c9c0233ecb48891d17 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -58,8 +58,8 @@ public function process(ContainerBuilder $container)
private function checkOutEdges(array $edges)
{
foreach ($edges as $edge) {
- $node = $edge->getDestNode();
- $id = $node->getId();
+ $node = $edge->getDestNode();
+ $id = $node->getId();
if (empty($this->checkedNodes[$id])) {
$searchKey = array_search($id, $this->currentPath);
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
index c8978f377f44cf287fa8fb6db342035bce12b3aa..ce89f24e183e3b5d6fab47e8fdcb0f9e193619ba 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -42,28 +42,22 @@ public function process(ContainerBuilder $container)
foreach ($container->getDefinitions() as $id => $definition) {
// synthetic service is public
if ($definition->isSynthetic() && !$definition->isPublic()) {
- throw new RuntimeException(sprintf(
- 'A synthetic service ("%s") must be public.',
- $id
- ));
+ throw new RuntimeException(sprintf('A synthetic service ("%s") must be public.', $id));
}
// synthetic service has non-prototype scope
if ($definition->isSynthetic() && ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) {
- throw new RuntimeException(sprintf(
- 'A synthetic service ("%s") cannot be of scope "prototype".',
- $id
- ));
+ throw new RuntimeException(sprintf('A synthetic service ("%s") cannot be of scope "prototype".', $id));
+ }
+
+ if ($definition->getFactory() && ($definition->getFactoryClass() || $definition->getFactoryService() || $definition->getFactoryMethod())) {
+ throw new RuntimeException(sprintf('A service ("%s") can use either the old or the new factory syntax, not both.', $id));
}
// non-synthetic, non-abstract service has class
if (!$definition->isAbstract() && !$definition->isSynthetic() && !$definition->getClass()) {
- if ($definition->getFactoryClass() || $definition->getFactoryService()) {
- throw new RuntimeException(sprintf(
- 'Please add the class to service "%s" even if it is constructed by a factory '
- .'since we might need to add method calls based on compile-time checks.',
- $id
- ));
+ if ($definition->getFactory() || $definition->getFactoryClass() || $definition->getFactoryService()) {
+ throw new RuntimeException(sprintf('Please add the class to service "%s" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $id));
}
throw new RuntimeException(sprintf(
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index d2d3599046456ff8858488316375dc8cae395aea..6c529ee8bd04ad955a062a031df375d401eaeb97 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -64,9 +64,10 @@ public function process(ContainerBuilder $container)
);
$configurator = $this->inlineArguments($container, array($definition->getConfigurator()));
- $definition->setConfigurator(
- $configurator[0]
- );
+ $definition->setConfigurator($configurator[0]);
+
+ $factory = $this->inlineArguments($container, array($definition->getFactory()));
+ $definition->setFactory($factory[0]);
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
index 4527840e73f0bd2654788f7954b448300ec006c6..abda1874c9b60f186e901f74766bfb4f48a83c29 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -103,6 +103,9 @@ private function resolveDefinition($id, DefinitionDecorator $definition)
if (isset($changes['factory_service'])) {
$def->setFactoryService($definition->getFactoryService());
}
+ if (isset($changes['factory'])) {
+ $def->setFactory($definition->getFactory());
+ }
if (isset($changes['configurator'])) {
$def->setConfigurator($definition->getConfigurator());
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index 015bdebc8b520069fb5c7d6a73538f12488bda2c..c90d76f48adf562dcda125014988ff28bd9c803d 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -84,7 +85,12 @@ private function processArguments(array $arguments)
*/
private function getDefinitionId($id)
{
+ $seen = array();
while ($this->container->hasAlias($id)) {
+ if (isset($seen[$id])) {
+ throw new ServiceCircularReferenceException($id, array_keys($seen));
+ }
+ $seen[$id] = true;
$id = (string) $this->container->getAlias($id);
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php
index 3308d9f29ace9bf5ab945a774a0190695f431051..9b3af2464ecdb0598967801d1fecc856941ada9a 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php
@@ -217,11 +217,11 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)
$this->$method();
}
- if (self::SCOPE_CONTAINER !== $scope && null === $service) {
- unset($this->scopedServices[$scope][$id]);
- }
-
if (null === $service) {
+ if (self::SCOPE_CONTAINER !== $scope) {
+ unset($this->scopedServices[$scope][$id]);
+ }
+
unset($this->services[$id]);
}
}
@@ -450,14 +450,15 @@ public function leaveScope($name)
// the global service map
$services = array($this->services, $this->scopedServices[$name]);
unset($this->scopedServices[$name]);
+
foreach ($this->scopeChildren[$name] as $child) {
- if (!isset($this->scopedServices[$child])) {
- continue;
+ if (isset($this->scopedServices[$child])) {
+ $services[] = $this->scopedServices[$child];
+ unset($this->scopedServices[$child]);
}
-
- $services[] = $this->scopedServices[$child];
- unset($this->scopedServices[$child]);
}
+
+ // update global map
$this->services = call_user_func_array('array_diff_key', $services);
// check if we need to restore services of a previous scope of this type
@@ -465,6 +466,10 @@ public function leaveScope($name)
$services = $this->scopeStacks[$name]->pop();
$this->scopedServices += $services;
+ if ($this->scopeStacks[$name]->isEmpty()) {
+ unset($this->scopeStacks[$name]);
+ }
+
foreach ($services as $array) {
foreach ($array as $id => $service) {
$this->set($id, $service, $name);
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php
index c06b622da7d80bd3ff2578daaa0a7feb776eba0c..1d091a097f2b16dc6205697bd63cff46cac1b943 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -25,6 +25,7 @@
use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
use Symfony\Component\ExpressionLanguage\Expression;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
/**
* ContainerBuilder is a DI container that provides an API to easily describe services.
@@ -84,6 +85,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*/
private $expressionLanguage;
+ /**
+ * @var ExpressionFunctionProviderInterface[]
+ */
+ private $expressionLanguageProviders = array();
+
/**
* Sets the track resources flag.
*
@@ -464,10 +470,6 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
return $service;
}
- if (isset($this->loading[$id])) {
- throw new LogicException(sprintf('The service "%s" has a circular reference to itself.', $id), 0, $e);
- }
-
if (!$this->hasDefinition($id) && isset($this->aliasDefinitions[$id])) {
return $this->get($this->aliasDefinitions[$id]);
}
@@ -939,7 +941,19 @@ public function createService(Definition $definition, $id, $tryProxy = true)
$arguments = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments())));
- if (null !== $definition->getFactoryMethod()) {
+ if (null !== $definition->getFactory()) {
+ $factory = $definition->getFactory();
+
+ if (is_string($factory)) {
+ $callable = $definition->getFactory();
+ } elseif (is_array($factory)) {
+ $callable = array($this->resolveServices($factory[0]), $factory[1]);
+ } else {
+ throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
+ }
+
+ $service = call_user_func_array($callable, $arguments);
+ } elseif (null !== $definition->getFactoryMethod()) {
if (null !== $definition->getFactoryClass()) {
$factory = $parameterBag->resolveValue($definition->getFactoryClass());
} elseif (null !== $definition->getFactoryService()) {
@@ -1056,6 +1070,11 @@ public function findTags()
return array_unique($tags);
}
+ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
+ {
+ $this->expressionLanguageProviders[] = $provider;
+ }
+
/**
* Returns the Service Conditionals.
*
@@ -1161,7 +1180,7 @@ private function getExpressionLanguage()
if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
throw new RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
}
- $this->expressionLanguage = new ExpressionLanguage();
+ $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
}
return $this->expressionLanguage;
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php
index 77ee42b57cbe01247cef4ff41c9674ec8bc7ab83..a70f13c2aaafd8712a50ffcda1ad05ce65f2cef9 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -26,10 +26,10 @@
interface ContainerInterface
{
const EXCEPTION_ON_INVALID_REFERENCE = 1;
- const NULL_ON_INVALID_REFERENCE = 2;
- const IGNORE_ON_INVALID_REFERENCE = 3;
- const SCOPE_CONTAINER = 'container';
- const SCOPE_PROTOTYPE = 'prototype';
+ const NULL_ON_INVALID_REFERENCE = 2;
+ const IGNORE_ON_INVALID_REFERENCE = 3;
+ const SCOPE_CONTAINER = 'container';
+ const SCOPE_PROTOTYPE = 'prototype';
/**
* Sets a service.
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php
index f83c069c6390626c971f3b315a4f52004b68825c..b77a13737a5bb88777823cbc73623912ac014e75 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php
@@ -25,6 +25,7 @@ class Definition
{
private $class;
private $file;
+ private $factory;
private $factoryClass;
private $factoryMethod;
private $factoryService;
@@ -56,6 +57,34 @@ public function __construct($class = null, array $arguments = array())
$this->arguments = $arguments;
}
+ /**
+ * Sets a factory.
+ *
+ * @param string|array $factory A PHP function or an array containing a class/Reference and a method to call
+ *
+ * @return Definition The current instance
+ */
+ public function setFactory($factory)
+ {
+ if (is_string($factory) && strpos($factory, '::') !== false) {
+ $factory = explode('::', $factory, 2);
+ }
+
+ $this->factory = $factory;
+
+ return $this;
+ }
+
+ /**
+ * Gets the factory.
+ *
+ * @return string|array The PHP function or an array containing a class/Reference and a method to call
+ */
+ public function getFactory()
+ {
+ return $this->factory;
+ }
+
/**
* Sets the name of the class that acts as a factory using the factory method,
* which will be invoked statically.
@@ -65,6 +94,7 @@ public function __construct($class = null, array $arguments = array())
* @return Definition The current instance
*
* @api
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function setFactoryClass($factoryClass)
{
@@ -79,6 +109,7 @@ public function setFactoryClass($factoryClass)
* @return string|null The factory class name
*
* @api
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function getFactoryClass()
{
@@ -93,6 +124,7 @@ public function getFactoryClass()
* @return Definition The current instance
*
* @api
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function setFactoryMethod($factoryMethod)
{
@@ -142,6 +174,7 @@ public function getDecoratedService()
* @return string|null The factory method name
*
* @api
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function getFactoryMethod()
{
@@ -156,6 +189,7 @@ public function getFactoryMethod()
* @return Definition The current instance
*
* @api
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function setFactoryService($factoryService)
{
@@ -170,6 +204,7 @@ public function setFactoryService($factoryService)
* @return string|null The factory service id
*
* @api
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function getFactoryService()
{
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php
index 497c394dffedf13e2d78be1e8a1b2df94617df78..390147ea066455f3e9588eb9e8b146992b1b981c 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -76,6 +76,16 @@ public function setClass($class)
return parent::setClass($class);
}
+ /**
+ * {@inheritdoc}
+ */
+ public function setFactory($callable)
+ {
+ $this->changes['factory'] = true;
+
+ return parent::setFactory($callable);
+ }
+
/**
* {@inheritdoc}
*
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
index d9325c957d0b767e257c251dc03a3b57dbcb1ba0..9ba26704c6e432a5cd77dca7e326bd541c0e6957 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -35,8 +35,8 @@ class GraphvizDumper extends Dumper
private $edges;
private $options = array(
'graph' => array('ratio' => 'compress'),
- 'node' => array('fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'),
- 'edge' => array('fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5),
+ 'node' => array('fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'),
+ 'edge' => array('fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5),
'node.instance' => array('fillcolor' => '#9999ff', 'style' => 'filled'),
'node.definition' => array('fillcolor' => '#eeeeee'),
'node.missing' => array('fillcolor' => '#ff9999', 'style' => 'filled'),
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 7ab109b21c436f52e072f2e556d653ed30aab086..2b5277f737e2f34e8435c177ce3a246e6b6fc79e 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -25,6 +25,7 @@
use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper;
use Symfony\Component\DependencyInjection\ExpressionLanguage;
use Symfony\Component\ExpressionLanguage\Expression;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
/**
* PhpDumper dumps a service container as a PHP class.
@@ -55,6 +56,11 @@ class PhpDumper extends Dumper
private $reservedVariables = array('instance', 'class');
private $expressionLanguage;
+ /**
+ * @var ExpressionFunctionProviderInterface[]
+ */
+ private $expressionLanguageProviders = array();
+
/**
* @var \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface
*/
@@ -100,7 +106,7 @@ public function setProxyDumper(ProxyDumper $proxyDumper)
public function dump(array $options = array())
{
$options = array_merge(array(
- 'class' => 'ProjectServiceContainer',
+ 'class' => 'ProjectServiceContainer',
'base_class' => 'Container',
'namespace' => '',
), $options);
@@ -109,6 +115,7 @@ public function dump(array $options = array())
if ($this->container->isFrozen()) {
$code .= $this->addFrozenConstructor();
+ $code .= $this->addFrozenCompile();
} else {
$code .= $this->addConstructor();
}
@@ -160,6 +167,7 @@ private function addServiceLocalTempVariables($cId, $definition)
$this->getServiceCallsFromArguments($iDefinition->getMethodCalls(), $calls, $behavior);
$this->getServiceCallsFromArguments($iDefinition->getProperties(), $calls, $behavior);
$this->getServiceCallsFromArguments(array($iDefinition->getConfigurator()), $calls, $behavior);
+ $this->getServiceCallsFromArguments(array($iDefinition->getFactory()), $calls, $behavior);
}
$code = '';
@@ -339,9 +347,9 @@ private function addServiceInstance($id, $definition)
throw new InvalidArgumentException(sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));
}
- $simple = $this->isSimpleInstance($id, $definition);
+ $simple = $this->isSimpleInstance($id, $definition);
$isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition);
- $instantiation = '';
+ $instantiation = '';
if (!$isProxyCandidate && ContainerInterface::SCOPE_CONTAINER === $definition->getScope()) {
$instantiation = "\$this->services['$id'] = ".($simple ? '' : '$instance');
@@ -522,6 +530,17 @@ private function addService($id, $definition)
$return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
} elseif ($class = $definition->getClass()) {
$return[] = sprintf("@return %s A %s instance.", 0 === strpos($class, '%') ? 'object' : "\\".$class, $class);
+ } elseif ($definition->getFactory()) {
+ $factory = $definition->getFactory();
+ if (is_string($factory)) {
+ $return[] = sprintf('@return object An instance returned by %s().', $factory);
+ } elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
+ if (is_string($factory[0]) || $factory[0] instanceof Reference) {
+ $return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]);
+ } elseif ($factory[0] instanceof Definition) {
+ $return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]);
+ }
+ }
} elseif ($definition->getFactoryClass()) {
$return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryClass(), $definition->getFactoryMethod());
} elseif ($definition->getFactoryService()) {
@@ -559,17 +578,17 @@ private function addService($id, $definition)
}
if ($definition->isLazy()) {
- $lazyInitialization = '$lazyLoad = true';
+ $lazyInitialization = '$lazyLoad = true';
$lazyInitializationDoc = "\n * @param bool \$lazyLoad whether to try lazy-loading the service with a proxy\n *";
} else {
- $lazyInitialization = '';
+ $lazyInitialization = '';
$lazyInitializationDoc = '';
}
// with proxies, for 5.3.3 compatibility, the getter must be public to be accessible to the initializer
$isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition);
- $visibility = $isProxyCandidate ? 'public' : 'protected';
- $code = <<<EOF
+ $visibility = $isProxyCandidate ? 'public' : 'protected';
+ $code = <<<EOF
/**
* Gets the '$id' service.$doc
@@ -700,7 +719,25 @@ private function addNewInstance($id, Definition $definition, $return, $instantia
$arguments[] = $this->dumpValue($value);
}
- if (null !== $definition->getFactoryMethod()) {
+ if (null !== $definition->getFactory()) {
+ $callable = $definition->getFactory();
+ if (is_array($callable)) {
+ if ($callable[0] instanceof Reference
+ || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))) {
+ return sprintf(" $return{$instantiation}%s->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
+ }
+
+ $class = $this->dumpValue($callable[0]);
+ // If the class is a string we can optimize call_user_func away
+ if (strpos($class, "'") === 0) {
+ return sprintf(" $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');
+ }
+
+ return sprintf(" $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
+ }
+
+ return sprintf(" $return{$instantiation}\\%s(%s);\n", $callable, $arguments ? implode(', ', $arguments) : '');
+ } elseif (null !== $definition->getFactoryMethod()) {
if (null !== $definition->getFactoryClass()) {
$class = $this->dumpValue($definition->getFactoryClass());
@@ -769,16 +806,18 @@ class $class extends $baseClass
*/
private function addConstructor()
{
- $arguments = $this->container->getParameterBag()->all() ? 'new ParameterBag($this->getDefaultParameters())' : null;
+ $parameters = $this->exportParameters($this->container->getParameterBag()->all());
$code = <<<EOF
+ private static \$parameters = $parameters;
+
/**
* Constructor.
*/
public function __construct()
{
- parent::__construct($arguments);
+ parent::__construct(new ParameterBag(self::\$parameters));
EOF;
@@ -806,23 +845,17 @@ public function __construct()
*/
private function addFrozenConstructor()
{
+ $parameters = $this->exportParameters($this->container->getParameterBag()->all());
+
$code = <<<EOF
- private \$parameters;
+ private static \$parameters = $parameters;
/**
* Constructor.
*/
public function __construct()
{
-EOF;
-
- if ($this->container->getParameterBag()->all()) {
- $code .= "\n \$this->parameters = \$this->getDefaultParameters();\n";
- }
-
- $code .= <<<EOF
-
\$this->services =
\$this->scopedServices =
\$this->scopeStacks = array();
@@ -851,6 +884,26 @@ public function __construct()
return $code;
}
+ /**
+ * Adds the constructor for a frozen container.
+ *
+ * @return string
+ */
+ private function addFrozenCompile()
+ {
+ return <<<EOF
+
+ /**
+ * {@inheritdoc}
+ */
+ public function compile()
+ {
+ throw new LogicException('You cannot compile a dumped frozen container.');
+ }
+
+EOF;
+ }
+
/**
* Adds the methodMap property definition
*
@@ -910,8 +963,6 @@ private function addDefaultParametersMethod()
return '';
}
- $parameters = $this->exportParameters($this->container->getParameterBag()->all());
-
$code = '';
if ($this->container->isFrozen()) {
$code .= <<<EOF
@@ -923,11 +974,11 @@ public function getParameter(\$name)
{
\$name = strtolower(\$name);
- if (!(isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters))) {
+ if (!(isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
}
- return \$this->parameters[\$name];
+ return self::\$parameters[\$name];
}
/**
@@ -937,7 +988,7 @@ public function hasParameter(\$name)
{
\$name = strtolower(\$name);
- return isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters);
+ return isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters);
}
/**
@@ -954,27 +1005,14 @@ public function setParameter(\$name, \$value)
public function getParameterBag()
{
if (null === \$this->parameterBag) {
- \$this->parameterBag = new FrozenParameterBag(\$this->parameters);
+ \$this->parameterBag = new FrozenParameterBag(self::\$parameters);
}
return \$this->parameterBag;
}
-EOF;
- }
-
- $code .= <<<EOF
-
- /**
- * Gets the default parameters.
- *
- * @return array An array of the default parameters
- */
- protected function getDefaultParameters()
- {
- return $parameters;
- }
EOF;
+ }
return $code;
}
@@ -1095,7 +1133,8 @@ private function getInlinedDefinitions(Definition $definition)
$this->getDefinitionsFromArguments($definition->getArguments()),
$this->getDefinitionsFromArguments($definition->getMethodCalls()),
$this->getDefinitionsFromArguments($definition->getProperties()),
- $this->getDefinitionsFromArguments(array($definition->getConfigurator()))
+ $this->getDefinitionsFromArguments(array($definition->getConfigurator())),
+ $this->getDefinitionsFromArguments(array($definition->getFactory()))
);
$this->inlinedDefinitions->offsetSet($definition, $definitions);
@@ -1173,7 +1212,7 @@ private function hasReference($id, array $arguments, $deep = false, array $visit
/**
* Dumps values.
*
- * @param array $value
+ * @param mixed $value
* @param bool $interpolate
*
* @return string
@@ -1210,6 +1249,30 @@ private function dumpValue($value, $interpolate = true)
throw new RuntimeException('Cannot dump definitions which have a variable class name.');
}
+ if (null !== $value->getFactory()) {
+ $factory = $value->getFactory();
+
+ if (is_string($factory)) {
+ return sprintf('\\%s(%s)', $factory, implode(', ', $arguments));
+ }
+
+ if (is_array($factory)) {
+ if (is_string($factory[0])) {
+ return sprintf('\\%s::%s(%s)', $factory[0], $factory[1], implode(', ', $arguments));
+ }
+
+ if ($factory[0] instanceof Definition) {
+ return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
+ }
+
+ if ($factory[0] instanceof Reference) {
+ return sprintf('%s->%s(%s)', $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));
+ }
+ }
+
+ throw new RuntimeException('Cannot dump definition because of invalid factory');
+ }
+
if (null !== $value->getFactoryMethod()) {
if (null !== $value->getFactoryClass()) {
return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($value->getFactoryClass()), $value->getFactoryMethod(), count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
@@ -1283,6 +1346,11 @@ public function dumpParameter($name)
return sprintf("\$this->getParameter('%s')", strtolower($name));
}
+ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
+ {
+ $this->expressionLanguageProviders[] = $provider;
+ }
+
/**
* Gets a service call
*
@@ -1372,7 +1440,7 @@ private function getExpressionLanguage()
if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
throw new RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
}
- $this->expressionLanguage = new ExpressionLanguage();
+ $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
}
return $this->expressionLanguage;
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index e3a533eed2783c2a0cf6dcfc481e9c5febcc3be1..2f120c18b7476d9751e935b31559631e5b35852b 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -176,6 +176,17 @@ private function addService($definition, $id, \DOMElement $parent)
$this->addMethodCalls($definition->getMethodCalls(), $service);
+ if ($callable = $definition->getFactory()) {
+ $factory = $this->document->createElement('factory');
+ if (is_array($callable)) {
+ $factory->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
+ $factory->setAttribute('method', $callable[1]);
+ } else {
+ $factory->setAttribute('function', $callable);
+ }
+ $service->appendChild($factory);
+ }
+
if ($callable = $definition->getConfigurator()) {
$configurator = $this->document->createElement('configurator');
if (is_array($callable)) {
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 613620c2333ab134e9c71f648427ef731e4763b7..f96416e1cbaaa9618161f0c008b4474747952eca 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -147,16 +147,12 @@ private function addService($id, $definition)
}
}
- if ($callable = $definition->getConfigurator()) {
- if (is_array($callable)) {
- if ($callable[0] instanceof Reference) {
- $callable = array($this->getServiceCall((string) $callable[0], $callable[0]), $callable[1]);
- } else {
- $callable = array($callable[0], $callable[1]);
- }
- }
+ if ($callable = $definition->getFactory()) {
+ $code .= sprintf(" factory: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
+ }
- $code .= sprintf(" configurator: %s\n", $this->dumper->dump($callable, 0));
+ if ($callable = $definition->getConfigurator()) {
+ $code .= sprintf(" configurator: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
}
return $code;
@@ -222,6 +218,26 @@ private function addParameters()
return $this->dumper->dump(array('parameters' => $parameters), 2);
}
+ /**
+ * Dumps callable to YAML format
+ *
+ * @param callable $callable
+ *
+ * @return callable
+ */
+ private function dumpCallable($callable)
+ {
+ if (is_array($callable)) {
+ if ($callable[0] instanceof Reference) {
+ $callable = array($this->getServiceCall((string) $callable[0], $callable[0]), $callable[1]);
+ } else {
+ $callable = array($callable[0], $callable[1]);
+ }
+ }
+
+ return $callable;
+ }
+
/**
* Dumps the value to YAML format
*
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguage.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguage.php
index 2e7edcd32f62fcf4e58a06b689591d38f9c49a96..8b236dbd5b3cefc652393fd5f8f79e9b47803e50 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguage.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguage.php
@@ -12,31 +12,22 @@
namespace Symfony\Component\DependencyInjection;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
+use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface;
/**
* Adds some function to the default ExpressionLanguage.
*
- * To get a service, use service('request').
- * To get a parameter, use parameter('kernel.debug').
- *
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @see ExpressionLanguageProvider
*/
class ExpressionLanguage extends BaseExpressionLanguage
{
- protected function registerFunctions()
+ public function __construct(ParserCacheInterface $cache = null, array $providers = array())
{
- parent::registerFunctions();
-
- $this->register('service', function ($arg) {
- return sprintf('$this->get(%s)', $arg);
- }, function (array $variables, $value) {
- return $variables['container']->get($value);
- });
+ // prepend the default provider to let users overide it easily
+ array_unshift($providers, new ExpressionLanguageProvider());
- $this->register('parameter', function ($arg) {
- return sprintf('$this->getParameter(%s)', $arg);
- }, function (array $variables, $value) {
- return $variables['container']->getParameter($value);
- });
+ parent::__construct($cache, $providers);
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..ce6d69522e19127631ad4ae534e441119e4f6a5c
--- /dev/null
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
@@ -0,0 +1,43 @@
+<?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\DependencyInjection;
+
+use Symfony\Component\ExpressionLanguage\ExpressionFunction;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
+
+/**
+ * Define some ExpressionLanguage functions.
+ *
+ * To get a service, use service('request').
+ * To get a parameter, use parameter('kernel.debug').
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
+{
+ public function getFunctions()
+ {
+ return array(
+ new ExpressionFunction('service', function ($arg) {
+ return sprintf('$this->get(%s)', $arg);
+ }, function (array $variables, $value) {
+ return $variables['container']->get($value);
+ }),
+
+ new ExpressionFunction('parameter', function ($arg) {
+ return sprintf('$this->getParameter(%s)', $arg);
+ }, function (array $variables, $value) {
+ return $variables['container']->getParameter($value);
+ }),
+ );
+ }
+}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
index 30cbe0ebaf99eab085279ba2f5c29d15709cac9c..a5b4e5ad240e5f0df7ad6bb5cc23d46bc97f1e2a 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
@@ -36,23 +36,15 @@ public function __construct(ContainerBuilder $container)
}
/**
- * Loads a Closure.
- *
- * @param \Closure $closure The resource
- * @param string $type The resource type
+ * {@inheritdoc}
*/
- public function load($closure, $type = null)
+ public function load($resource, $type = null)
{
- call_user_func($closure, $this->container);
+ call_user_func($resource, $this->container);
}
/**
- * Returns true if this class supports the given resource.
- *
- * @param mixed $resource A resource
- * @param string $type The resource type
- *
- * @return bool true if this class supports the given resource, false otherwise
+ * {@inheritdoc}
*/
public function supports($resource, $type = null)
{
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index ad437b5138d42edfd836c1ae3da13b5c9878aec3..d71eecf74156f6496601d71581102ee5257f7876 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -27,8 +27,8 @@ abstract class FileLoader extends BaseFileLoader
/**
* Constructor.
*
- * @param ContainerBuilder $container A ContainerBuilder instance
- * @param FileLocatorInterface $locator A FileLocator instance
+ * @param ContainerBuilder $container A ContainerBuilder instance
+ * @param FileLocatorInterface $locator A FileLocator instance
*/
public function __construct(ContainerBuilder $container, FileLocatorInterface $locator)
{
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
index 189eaa5fde155eda2ace59f063804e277cf2458c..16ddf87f851123aa1087c61c715e599c3adf20e0 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -22,22 +22,17 @@
class IniFileLoader extends FileLoader
{
/**
- * Loads a resource.
- *
- * @param mixed $file The resource
- * @param string $type The resource type
- *
- * @throws InvalidArgumentException When ini file is not valid
+ * {@inheritdoc}
*/
- public function load($file, $type = null)
+ public function load($resource, $type = null)
{
- $path = $this->locator->locate($file);
+ $path = $this->locator->locate($resource);
$this->container->addResource(new FileResource($path));
$result = parse_ini_file($path, true);
if (false === $result || array() === $result) {
- throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $file));
+ throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $resource));
}
if (isset($result['parameters']) && is_array($result['parameters'])) {
@@ -48,12 +43,7 @@ public function load($file, $type = null)
}
/**
- * Returns true if this class supports the given resource.
- *
- * @param mixed $resource A resource
- * @param string $type The resource type
- *
- * @return bool true if this class supports the given resource, false otherwise
+ * {@inheritdoc}
*/
public function supports($resource, $type = null)
{
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index f3139ad70a827a110cdb668d1ac5bcfc2fdfe25b..08c1d9af4f653ddc11a395677a8ecfa23fceb848 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -24,18 +24,15 @@
class PhpFileLoader extends FileLoader
{
/**
- * Loads a PHP file.
- *
- * @param mixed $file The resource
- * @param string $type The resource type
+ * {@inheritdoc}
*/
- public function load($file, $type = null)
+ public function load($resource, $type = null)
{
// the container and loader variables are exposed to the included file below
$container = $this->container;
$loader = $this;
- $path = $this->locator->locate($file);
+ $path = $this->locator->locate($resource);
$this->setCurrentDir(dirname($path));
$this->container->addResource(new FileResource($path));
@@ -43,12 +40,7 @@ public function load($file, $type = null)
}
/**
- * Returns true if this class supports the given resource.
- *
- * @param mixed $resource A resource
- * @param string $type The resource type
- *
- * @return bool true if this class supports the given resource, false otherwise
+ * {@inheritdoc}
*/
public function supports($resource, $type = null)
{
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 32d2bb19ba40eaea550d5a340387a1878ed1047e..e3e5769ef4200a98f49104a29b4488b6c6a35968 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -32,14 +32,11 @@ class XmlFileLoader extends FileLoader
const NS = 'http://symfony.com/schema/dic/services';
/**
- * Loads an XML file.
- *
- * @param mixed $file The resource
- * @param string $type The resource type
+ * {@inheritdoc}
*/
- public function load($file, $type = null)
+ public function load($resource, $type = null)
{
- $path = $this->locator->locate($file);
+ $path = $this->locator->locate($resource);
$xml = $this->parseFileToDOM($path);
@@ -62,12 +59,7 @@ public function load($file, $type = null)
}
/**
- * Returns true if this class supports the given resource.
- *
- * @param mixed $resource A resource
- * @param string $type The resource type
- *
- * @return bool true if this class supports the given resource, false otherwise
+ * {@inheritdoc}
*/
public function supports($resource, $type = null)
{
@@ -167,6 +159,21 @@ private function parseDefinition($id, \DOMElement $service, $file)
$definition->setArguments($this->getArgumentsAsPhp($service, 'argument'));
$definition->setProperties($this->getArgumentsAsPhp($service, 'property'));
+ if ($factories = $this->getChildren($service, 'factory')) {
+ $factory = $factories[0];
+ if ($function = $factory->getAttribute('function')) {
+ $definition->setFactory($function);
+ } else {
+ if ($childService = $factory->getAttribute('service')) {
+ $class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
+ } else {
+ $class = $factory->getAttribute('class');
+ }
+
+ $definition->setFactory(array($class, $factory->getAttribute('method')));
+ }
+ }
+
if ($configurators = $this->getChildren($service, 'configurator')) {
$configurator = $configurators[0];
if ($function = $configurator->getAttribute('function')) {
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 39bdf9488724347c68e0ca3c0a16c67f76ce89cf..eb64da81713547014e3074c5d96f8bb9fe9c7315 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -33,14 +33,11 @@ class YamlFileLoader extends FileLoader
private $yamlParser;
/**
- * Loads a Yaml file.
- *
- * @param mixed $file The resource
- * @param string $type The resource type
+ * {@inheritdoc}
*/
- public function load($file, $type = null)
+ public function load($resource, $type = null)
{
- $path = $this->locator->locate($file);
+ $path = $this->locator->locate($resource);
$content = $this->loadFile($path);
@@ -57,7 +54,7 @@ public function load($file, $type = null)
// parameters
if (isset($content['parameters'])) {
if (!is_array($content['parameters'])) {
- throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $file));
+ throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $resource));
}
foreach ($content['parameters'] as $key => $value) {
@@ -69,16 +66,11 @@ public function load($file, $type = null)
$this->loadFromExtensions($content);
// services
- $this->parseDefinitions($content, $file);
+ $this->parseDefinitions($content, $resource);
}
/**
- * Returns true if this class supports the given resource.
- *
- * @param mixed $resource A resource
- * @param string $type The resource type
- *
- * @return bool true if this class supports the given resource, false otherwise
+ * {@inheritdoc}
*/
public function supports($resource, $type = null)
{
@@ -194,6 +186,19 @@ private function parseDefinition($id, $service, $file)
$definition->setAbstract($service['abstract']);
}
+ if (isset($service['factory'])) {
+ if (is_string($service['factory'])) {
+ if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) {
+ $parts = explode(':', $service['factory']);
+ $definition->setFactory(array($this->resolveServices('@'.$parts[0]), $parts[1]));
+ } else {
+ $definition->setFactory($service['factory']);
+ }
+ } else {
+ $definition->setFactory(array($this->resolveServices($service['factory'][0]), $service['factory'][1]));
+ }
+ }
+
if (isset($service['factory_class'])) {
$definition->setFactoryClass($service['factory_class']);
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 54a4544ad50d36407e1116f73efea3e76b6187ef..966f4de07fe4302520b2f67f295645ffb96a47e7 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -64,7 +64,7 @@
<xsd:attribute name="ignore-errors" type="boolean" />
</xsd:complexType>
- <xsd:complexType name="configurator">
+ <xsd:complexType name="callable">
<xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="service" type="xsd:string" />
<xsd:attribute name="class" type="xsd:string" />
@@ -76,7 +76,8 @@
<xsd:choice maxOccurs="unbounded">
<xsd:element name="file" type="xsd:string" minOccurs="0" maxOccurs="1" />
<xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="configurator" type="configurator" minOccurs="0" maxOccurs="1" />
+ <xsd:element name="configurator" type="callable" minOccurs="0" maxOccurs="1" />
+ <xsd:element name="factory" type="callable" minOccurs="0" maxOccurs="1" />
<xsd:element name="call" type="call" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="tag" type="tag" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md
index 29d1cd0aa0c5d73773eb879f890cc16d3ab3eded..387fae4c107b0a8dbab6c625b4e47ab1a713922f 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md
@@ -6,45 +6,50 @@ Injection Container.
Here is a simple example that shows how to register services and parameters:
- use Symfony\Component\DependencyInjection\ContainerBuilder;
- use Symfony\Component\DependencyInjection\Reference;
+```php
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
- $sc = new ContainerBuilder();
- $sc
- ->register('foo', '%foo.class%')
- ->addArgument(new Reference('bar'))
- ;
- $sc->setParameter('foo.class', 'Foo');
+$sc = new ContainerBuilder();
+$sc
+ ->register('foo', '%foo.class%')
+ ->addArgument(new Reference('bar'))
+;
+$sc->setParameter('foo.class', 'Foo');
- $sc->get('foo');
+$sc->get('foo');
+```
Method Calls (Setter Injection):
- $sc = new ContainerBuilder();
+```php
+$sc = new ContainerBuilder();
- $sc
- ->register('bar', '%bar.class%')
- ->addMethodCall('setFoo', array(new Reference('foo')))
- ;
- $sc->setParameter('bar.class', 'Bar');
+$sc
+ ->register('bar', '%bar.class%')
+ ->addMethodCall('setFoo', array(new Reference('foo')))
+;
+$sc->setParameter('bar.class', 'Bar');
- $sc->get('bar');
+$sc->get('bar');
+```
Factory Class:
If your service is retrieved by calling a static method:
- $sc = new ContainerBuilder();
+```php
+$sc = new ContainerBuilder();
- $sc
- ->register('bar', '%bar.class%')
- ->setFactoryClass('%bar.class%')
- ->setFactoryMethod('getInstance')
- ->addArgument('Aarrg!!!')
- ;
- $sc->setParameter('bar.class', 'Bar');
+$sc
+ ->register('bar', '%bar.class%')
+ ->setFactory(array('%bar.class%', 'getInstance'))
+ ->addArgument('Aarrg!!!')
+;
+$sc->setParameter('bar.class', 'Bar');
- $sc->get('bar');
+$sc->get('bar');
+```
File Include:
@@ -52,16 +57,18 @@ For some services, especially those that are difficult or impossible to
autoload, you may need the container to include a file before
instantiating your class.
- $sc = new ContainerBuilder();
+```php
+$sc = new ContainerBuilder();
- $sc
- ->register('bar', '%bar.class%')
- ->setFile('/path/to/file')
- ->addArgument('Aarrg!!!')
- ;
- $sc->setParameter('bar.class', 'Bar');
+$sc
+ ->register('bar', '%bar.class%')
+ ->setFile('/path/to/file')
+ ->addArgument('Aarrg!!!')
+;
+$sc->setParameter('bar.class', 'Bar');
- $sc->get('bar');
+$sc->get('bar');
+```
Resources
---------
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
index b5e49842e7af4e9df575759ff9dd5452ca78eb4e..ed04a8b18ce5a66a752908910884d94eb397dcb7 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -50,6 +50,17 @@ public function testProcessDetectsNonSyntheticNonAbstractDefinitionWithoutClass(
$this->process($container);
}
+ /**
+ * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+ */
+ public function testProcessDetectsBothFactorySyntaxesUsed()
+ {
+ $container = new ContainerBuilder();
+ $container->register('a')->setFactory(array('a', 'b'))->setFactoryClass('a');
+
+ $this->process($container);
+ }
+
public function testProcess()
{
$container = new ContainerBuilder();
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
index ca089a556b13b9f96dbb070d2e6a85b7d285d659..6fdc233941e6473339b6b0a933b591a9cc6cc4b4 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
@@ -48,6 +48,17 @@ public function testProcessRecursively()
$this->assertEquals('foo', (string) $arguments[0]);
}
+ /**
+ * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
+ */
+ public function testAliasCircularReference()
+ {
+ $container = new ContainerBuilder();
+ $container->setAlias('bar', 'foo');
+ $container->setAlias('foo', 'bar');
+ $this->process($container);
+ }
+
protected function process(ContainerBuilder $container)
{
$pass = new ResolveReferencesToAliasesPass();
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 714a07b768181e4b68dbc7b8d0ce6418d9f3cef5..e74e5d4644c34a5f9636b2d062e26a57fa9dcf7b 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -341,6 +341,23 @@ public function testCreateServiceFactoryService()
$this->assertInstanceOf('BazClass', $builder->get('baz_service'));
}
+ /**
+ * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
+ */
+ public function testCreateServiceFactory()
+ {
+ $builder = new ContainerBuilder();
+ $builder->register('foo', 'Bar\FooClass')->setFactory('Bar\FooClass::getInstance');
+ $builder->register('qux', 'Bar\FooClass')->setFactory(array('Bar\FooClass', 'getInstance'));
+ $builder->register('bar', 'Bar\FooClass')->setFactory(array(new Definition('Bar\FooClass'), 'getInstance'));
+ $builder->register('baz', 'Bar\FooClass')->setFactory(array(new Reference('bar'), 'getInstance'));
+
+ $this->assertTrue($builder->get('foo')->called, '->createService() calls the factory method to create the service instance');
+ $this->assertTrue($builder->get('qux')->called, '->createService() calls the factory method to create the service instance');
+ $this->assertTrue($builder->get('bar')->called, '->createService() uses anonymous service as factory');
+ $this->assertTrue($builder->get('baz')->called, '->createService() uses another service as factory');
+ }
+
/**
* @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
*/
@@ -569,7 +586,7 @@ public function testCompilesClassDefinitionsOfLazyServices()
$container->compile();
- $classesPath = realpath(__DIR__.'/Fixtures/includes/classes.php');
+ $classesPath = realpath(__DIR__.'/Fixtures/includes/classes.php');
$matchingResources = array_filter(
$container->getResources(),
function (ResourceInterface $resource) use ($classesPath) {
@@ -643,16 +660,16 @@ public function testRegisteredAndLoadedExtension()
public function testPrivateServiceUser()
{
- $fooDefinition = new Definition('BarClass');
+ $fooDefinition = new Definition('BarClass');
$fooUserDefinition = new Definition('BarUserClass', array(new Reference('bar')));
- $container = new ContainerBuilder();
+ $container = new ContainerBuilder();
$container->setResourceTracking(false);
$fooDefinition->setPublic(false);
$container->addDefinitions(array(
- 'bar' => $fooDefinition,
- 'bar_user' => $fooUserDefinition,
+ 'bar' => $fooDefinition,
+ 'bar_user' => $fooUserDefinition,
));
$container->compile();
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index 314f3e61f12569becafca6b80b3c85d05bffdc19..508033f98a9cc3e85697f55e8917324b2367bd23 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -55,13 +55,35 @@ public function dataForTestCamelize()
);
}
+ /**
+ * @dataProvider dataForTestUnderscore
+ */
+ public function testUnderscore($id, $expected)
+ {
+ $this->assertEquals($expected, Container::underscore($id), sprintf('Container::underscore("%s")', $id));
+ }
+
+ public function dataForTestUnderscore()
+ {
+ return array(
+ array('FooBar', 'foo_bar'),
+ array('Foo_Bar', 'foo.bar'),
+ array('Foo_BarBaz', 'foo.bar_baz'),
+ array('FooBar_BazQux', 'foo_bar.baz_qux'),
+ array('_Foo', '.foo'),
+ array('Foo_', 'foo.'),
+ );
+ }
+
/**
* @covers Symfony\Component\DependencyInjection\Container::compile
*/
public function testCompile()
{
$sc = new Container(new ParameterBag(array('foo' => 'bar')));
+ $this->assertFalse($sc->getParameterBag()->isResolved(), '->compile() resolves the parameter bag');
$sc->compile();
+ $this->assertTrue($sc->getParameterBag()->isResolved(), '->compile() resolves the parameter bag');
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag', $sc->getParameterBag(), '->compile() changes the parameter bag to a FrozenParameterBag instance');
$this->assertEquals(array('foo' => 'bar'), $sc->getParameterBag()->all(), '->compile() copies the current parameters to the new parameter bag');
}
@@ -123,7 +145,8 @@ public function testGetServiceIds()
$this->assertEquals(array('service_container', 'foo', 'bar'), $sc->getServiceIds(), '->getServiceIds() returns all defined service ids');
$sc = new ProjectServiceContainer();
- $this->assertEquals(array('scoped', 'scoped_foo', 'inactive', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'service_container'), $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods');
+ $sc->set('foo', $obj = new \stdClass());
+ $this->assertEquals(array('scoped', 'scoped_foo', 'scoped_synchronized_foo', 'inactive', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'service_container', 'foo'), $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods, followed by service ids defined by set()');
}
/**
@@ -143,7 +166,7 @@ public function testSetWithNullResetTheService()
{
$sc = new Container();
$sc->set('foo', null);
- $this->assertFalse($sc->has('foo'));
+ $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
}
/**
@@ -152,7 +175,7 @@ public function testSetWithNullResetTheService()
public function testSetDoesNotAllowPrototypeScope()
{
$c = new Container();
- $c->set('foo', new \stdClass(), 'prototype');
+ $c->set('foo', new \stdClass(), Container::SCOPE_PROTOTYPE);
}
/**
@@ -172,9 +195,18 @@ public function testSetAlsoSetsScopedService()
$c->enterScope('foo');
$c->set('foo', $foo = new \stdClass(), 'foo');
- $services = $this->getField($c, 'scopedServices');
- $this->assertTrue(isset($services['foo']['foo']));
- $this->assertSame($foo, $services['foo']['foo']);
+ $scoped = $this->getField($c, 'scopedServices');
+ $this->assertTrue(isset($scoped['foo']['foo']), '->set() sets a scoped service');
+ $this->assertSame($foo, $scoped['foo']['foo'], '->set() sets a scoped service');
+ }
+
+ public function testSetAlsoCallsSynchronizeService()
+ {
+ $c = new ProjectServiceContainer();
+ $c->addScope(new Scope('foo'));
+ $c->enterScope('foo');
+ $c->set('scoped_synchronized_foo', $bar = new \stdClass(), 'foo');
+ $this->assertTrue($c->synchronized, '->set() calls synchronize*Service() if it is defined for the service');
}
/**
@@ -185,6 +217,7 @@ public function testGet()
$sc = new ProjectServiceContainer();
$sc->set('foo', $foo = new \stdClass());
$this->assertEquals($foo, $sc->get('foo'), '->get() returns the service for the given id');
+ $this->assertEquals($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
$this->assertEquals($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
$this->assertEquals($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
$this->assertEquals($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
@@ -199,7 +232,7 @@ public function testGet()
} catch (\Exception $e) {
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws a ServiceNotFoundException exception if the service is empty');
}
- $this->assertNull($sc->get('', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+ $this->assertNull($sc->get('', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if the service is empty');
}
public function testGetThrowServiceNotFoundException()
@@ -316,16 +349,15 @@ public function testEnterLeaveScopeWithChildScopes()
$a = new \stdClass();
$container->set('a', $a, 'bar');
- $services = $this->getField($container, 'scopedServices');
- $this->assertTrue(isset($services['bar']['a']));
- $this->assertSame($a, $services['bar']['a']);
-
+ $scoped = $this->getField($container, 'scopedServices');
+ $this->assertTrue(isset($scoped['bar']['a']));
+ $this->assertSame($a, $scoped['bar']['a']);
$this->assertTrue($container->has('a'));
- $container->leaveScope('foo');
- $services = $this->getField($container, 'scopedServices');
- $this->assertFalse(isset($services['bar']));
+ $container->leaveScope('foo');
+ $scoped = $this->getField($container, 'scopedServices');
+ $this->assertFalse(isset($scoped['bar']));
$this->assertFalse($container->isScopeActive('foo'));
$this->assertFalse($container->has('a'));
}
@@ -347,19 +379,83 @@ public function testEnterScopeRecursivelyWithInactiveChildScopes()
$a = new \stdClass();
$container->set('a', $a, 'foo');
- $services = $this->getField($container, 'scopedServices');
- $this->assertTrue(isset($services['foo']['a']));
- $this->assertSame($a, $services['foo']['a']);
-
+ $scoped = $this->getField($container, 'scopedServices');
+ $this->assertTrue(isset($scoped['foo']['a']));
+ $this->assertSame($a, $scoped['foo']['a']);
$this->assertTrue($container->has('a'));
+
$container->enterScope('foo');
- $services = $this->getField($container, 'scopedServices');
- $this->assertFalse(isset($services['a']));
+ $scoped = $this->getField($container, 'scopedServices');
+ $this->assertFalse(isset($scoped['a']));
+ $this->assertTrue($container->isScopeActive('foo'));
+ $this->assertFalse($container->isScopeActive('bar'));
+ $this->assertFalse($container->has('a'));
+
+ $container->enterScope('bar');
+
+ $this->assertTrue($container->isScopeActive('bar'));
+
+ $container->leaveScope('foo');
$this->assertTrue($container->isScopeActive('foo'));
$this->assertFalse($container->isScopeActive('bar'));
+ $this->assertTrue($container->has('a'));
+ }
+
+ public function testEnterChildScopeRecursively()
+ {
+ $container = new Container();
+ $container->addScope(new Scope('foo'));
+ $container->addScope(new Scope('bar', 'foo'));
+
+ $container->enterScope('foo');
+ $container->enterScope('bar');
+
+ $this->assertTrue($container->isScopeActive('bar'));
$this->assertFalse($container->has('a'));
+
+ $a = new \stdClass();
+ $container->set('a', $a, 'bar');
+
+ $scoped = $this->getField($container, 'scopedServices');
+ $this->assertTrue(isset($scoped['bar']['a']));
+ $this->assertSame($a, $scoped['bar']['a']);
+ $this->assertTrue($container->has('a'));
+
+ $container->enterScope('bar');
+
+ $scoped = $this->getField($container, 'scopedServices');
+ $this->assertFalse(isset($scoped['a']));
+ $this->assertTrue($container->isScopeActive('foo'));
+ $this->assertTrue($container->isScopeActive('bar'));
+ $this->assertFalse($container->has('a'));
+
+ $container->leaveScope('bar');
+
+ $this->assertTrue($container->isScopeActive('foo'));
+ $this->assertTrue($container->isScopeActive('bar'));
+ $this->assertTrue($container->has('a'));
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ */
+ public function testEnterScopeNotAdded()
+ {
+ $container = new Container();
+ $container->enterScope('foo');
+ }
+
+ /**
+ * @expectedException \RuntimeException
+ */
+ public function testEnterScopeDoesNotAllowInactiveParentScope()
+ {
+ $container = new Container();
+ $container->addScope(new Scope('foo'));
+ $container->addScope(new Scope('bar', 'foo'));
+ $container->enterScope('bar');
}
public function testLeaveScopeNotActive()
@@ -422,6 +518,11 @@ public function testAddScope()
$this->assertSame(array('foo' => 'container', 'bar' => 'foo'), $this->getField($c, 'scopes'));
$this->assertSame(array('foo' => array('bar'), 'bar' => array()), $this->getField($c, 'scopeChildren'));
+
+ $c->addScope(new Scope('baz', 'bar'));
+
+ $this->assertSame(array('foo' => 'container', 'bar' => 'foo', 'baz' => 'bar'), $this->getField($c, 'scopes'));
+ $this->assertSame(array('foo' => array('bar', 'baz'), 'bar' => array('baz'), 'baz' => array()), $this->getField($c, 'scopeChildren'));
}
public function testHasScope()
@@ -433,39 +534,22 @@ public function testHasScope()
$this->assertTrue($c->hasScope('foo'));
}
- public function testIsScopeActive()
- {
- $c = new Container();
-
- $this->assertFalse($c->isScopeActive('foo'));
- $c->addScope(new Scope('foo'));
-
- $this->assertFalse($c->isScopeActive('foo'));
- $c->enterScope('foo');
-
- $this->assertTrue($c->isScopeActive('foo'));
- $c->leaveScope('foo');
-
- $this->assertFalse($c->isScopeActive('foo'));
- }
-
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Something went terribly wrong!
+ */
public function testGetThrowsException()
{
$c = new ProjectServiceContainer();
try {
$c->get('throw_exception');
- $this->fail();
} catch (\Exception $e) {
- $this->assertEquals('Something went terribly wrong!', $e->getMessage());
+ // Do nothing.
}
- try {
- $c->get('throw_exception');
- $this->fail();
- } catch (\Exception $e) {
- $this->assertEquals('Something went terribly wrong!', $e->getMessage());
- }
+ // Retry, to make sure that get*Service() will be called.
+ $c->get('throw_exception');
}
public function testGetThrowsExceptionOnServiceConfiguration()
@@ -474,21 +558,37 @@ public function testGetThrowsExceptionOnServiceConfiguration()
try {
$c->get('throws_exception_on_service_configuration');
- $this->fail('The container can not contain invalid service!');
} catch (\Exception $e) {
- $this->assertEquals('Something was terribly wrong while trying to configure the service!', $e->getMessage());
+ // Do nothing.
}
+
$this->assertFalse($c->initialized('throws_exception_on_service_configuration'));
+ // Retry, to make sure that get*Service() will be called.
try {
$c->get('throws_exception_on_service_configuration');
- $this->fail('The container can not contain invalid service!');
} catch (\Exception $e) {
- $this->assertEquals('Something was terribly wrong while trying to configure the service!', $e->getMessage());
+ // Do nothing.
}
$this->assertFalse($c->initialized('throws_exception_on_service_configuration'));
}
+ public function testIsScopeActive()
+ {
+ $c = new Container();
+
+ $this->assertFalse($c->isScopeActive('foo'));
+ $c->addScope(new Scope('foo'));
+
+ $this->assertFalse($c->isScopeActive('foo'));
+ $c->enterScope('foo');
+
+ $this->assertTrue($c->isScopeActive('foo'));
+ $c->leaveScope('foo');
+
+ $this->assertFalse($c->isScopeActive('foo'));
+ }
+
public function getInvalidParentScopes()
{
return array(
@@ -525,6 +625,7 @@ public function testAlias()
class ProjectServiceContainer extends Container
{
public $__bar, $__foo_bar, $__foo_baz;
+ public $synchronized;
public function __construct()
{
@@ -533,12 +634,13 @@ public function __construct()
$this->__bar = new \stdClass();
$this->__foo_bar = new \stdClass();
$this->__foo_baz = new \stdClass();
+ $this->synchronized = false;
$this->aliases = array('alias' => 'bar');
}
protected function getScopedService()
{
- if (!isset($this->scopedServices['foo'])) {
+ if (!$this->isScopeActive('foo')) {
throw new \RuntimeException('Invalid call');
}
@@ -547,13 +649,27 @@ protected function getScopedService()
protected function getScopedFooService()
{
- if (!isset($this->scopedServices['foo'])) {
+ if (!$this->isScopeActive('foo')) {
throw new \RuntimeException('invalid call');
}
return $this->services['scoped_foo'] = $this->scopedServices['foo']['scoped_foo'] = new \stdClass();
}
+ protected function getScopedSynchronizedFooService()
+ {
+ if (!$this->isScopeActive('foo')) {
+ throw new \RuntimeException('invalid call');
+ }
+
+ return $this->services['scoped_bar'] = $this->scopedServices['foo']['scoped_bar'] = new \stdClass();
+ }
+
+ protected function synchronizeScopedSynchronizedFooService()
+ {
+ $this->synchronized = true;
+ }
+
protected function getInactiveService()
{
throw new InactiveScopeException('request', 'request');
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
index a266e9b31a4e07bfad204ecd2b87486d219edbc2..cea67408f0ddb11f15f5b4871b7a5efbd47f93b9 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
@@ -43,6 +43,7 @@ public function getPropertyTests()
{
return array(
array('class', 'class'),
+ array('factory', 'factory'),
array('factoryClass', 'factory_class'),
array('factoryMethod', 'factory_method'),
array('factoryService', 'factory_service'),
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index 9b4cf21ff90c7a669adc76815c74aedaae334932..cfcb5f486f0ca7466034e702726526d63e93104d 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -27,6 +27,21 @@ public function testConstructor()
$this->assertEquals(array('foo'), $def->getArguments(), '__construct() takes an optional array of arguments as its second argument');
}
+ /**
+ * @covers Symfony\Component\DependencyInjection\Definition::setFactory
+ * @covers Symfony\Component\DependencyInjection\Definition::getFactory
+ */
+ public function testSetGetFactory()
+ {
+ $def = new Definition('stdClass');
+
+ $this->assertSame($def, $def->setFactory('foo'), '->setFactory() implements a fluent interface');
+ $this->assertEquals('foo', $def->getFactory(), '->getFactory() returns the factory');
+
+ $def->setFactory('Foo::bar');
+ $this->assertEquals(array('Foo', 'bar'), $def->getFactory(), '->setFactory() converts string static method call to the array');
+ }
+
public function testSetGetFactoryClass()
{
$def = new Definition('stdClass');
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
index 8c7bf5ab26e4ad22688d6d63b4d40859c9ac99e9..79689d78dc4f1cbc7405045389f6ec6f2e525050 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
@@ -41,8 +41,8 @@ public function testDump()
$dumper = new GraphvizDumper($container);
$this->assertEquals($dumper->dump(array(
'graph' => array('ratio' => 'normal'),
- 'node' => array('fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'),
- 'edge' => array('fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1),
+ 'node' => array('fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'),
+ 'edge' => array('fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1),
'node.instance' => array('fillcolor' => 'green', 'style' => 'empty'),
'node.definition' => array('fillcolor' => 'grey'),
'node.missing' => array('fillcolor' => 'red', 'style' => 'empty'),
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 231ab773460a5c0994ccf742a5cf9f9f97257ce1..6cb04446e093ac488f9035e336858e5de84968a0 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -120,6 +120,14 @@ public function testAddService()
}
}
+ public function testServicesWithAnonymousFactories()
+ {
+ $container = include self::$fixturesPath.'/containers/container19.php';
+ $dumper = new PhpDumper($container);
+
+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services19.php', $dumper->dump(), '->dump() dumps services with anonymous factories');
+ }
+
/**
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage Service id "bar$" cannot be converted to a valid PHP method name.
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
new file mode 100644
index 0000000000000000000000000000000000000000..64b8f066dca105d28eec16279a9ed2ace7c1d995
--- /dev/null
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
@@ -0,0 +1,22 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+require_once __DIR__.'/../includes/classes.php';
+
+$container = new ContainerBuilder();
+
+$container
+ ->register('service_from_anonymous_factory', 'Bar\FooClass')
+ ->setFactory(array(new Definition('Bar\FooClass'), 'getInstance'))
+;
+
+$anonymousServiceWithFactory = new Definition('Bar\FooClass');
+$anonymousServiceWithFactory->setFactory('Bar\FooClass::getInstance');
+$container
+ ->register('service_with_method_call_and_factory', 'Bar\FooClass')
+ ->addMethodCall('setBar', array($anonymousServiceWithFactory))
+;
+
+return $container;
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php
index eec856412b09c367887dae64a71e462dd5ed3ce2..f0b4ca9330a3834fbe9003c26e78aeaa74ecd28a 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php
@@ -4,9 +4,9 @@
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
$container = new ContainerBuilder(new ParameterBag(array(
- 'FOO' => '%baz%',
- 'baz' => 'bar',
- 'bar' => 'foo is %%foo bar',
+ 'FOO' => '%baz%',
+ 'baz' => 'bar',
+ 'bar' => 'foo is %%foo bar',
'escape' => '@escapeme',
'values' => array(true, false, null, 0, 1000.3, 'true', 'false', 'null'),
)));
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
index 5565def1e8954c83edd488da9429d46be46d30a1..49262e86326ef12d58e941c94d48671a9e6ec08c 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
@@ -103,5 +103,20 @@
->register('decorator_service_with_name', 'stdClass')
->setDecoratedService('decorated', 'decorated.pif-pouf')
;
+$container
+ ->register('new_factory', 'FactoryClass')
+ ->setProperty('foo', 'bar')
+ ->setScope('container')
+ ->setPublic(false)
+;
+$container
+ ->register('new_factory_service', 'FooBarBaz')
+ ->setProperty('foo', 'bar')
+ ->setFactory(array(new Reference('new_factory'), 'getInstance'))
+;
+$container
+ ->register('service_from_static_method', 'Bar\FooClass')
+ ->setFactory(array('Bar\FooClass', 'getInstance'))
+;
return $container;
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
index 6bf53e56b65d5c9c2935726d08ab2617c814b214..e233d62594d0b6dc90dfc044494a267d631ba8d6 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
@@ -19,6 +19,9 @@ digraph sc {
node_decorated [label="decorated\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
node_decorator_service [label="decorator_service\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
node_decorator_service_with_name [label="decorator_service_with_name\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+ node_new_factory [label="new_factory\nFactoryClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+ node_new_factory_service [label="new_factory_service\nFooBarBaz\n", shape=record, fillcolor="#eeeeee", style="filled"];
+ node_service_from_static_method [label="service_from_static_method\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
node_foo2 [label="foo2\n\n", shape=record, fillcolor="#ff9999", style="filled"];
node_foo3 [label="foo3\n\n", shape=record, fillcolor="#ff9999", style="filled"];
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index 084e7891af906945e5812934c04f748a66f04fe0..42ff6661106a615a70a799d172e643fb4796c28b 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -16,11 +16,15 @@
*/
class ProjectServiceContainer extends Container
{
+ private static $parameters = array(
+
+ );
+
/**
* Constructor.
*/
public function __construct()
{
- parent::__construct();
+ parent::__construct(new ParameterBag(self::$parameters));
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index 2ccd9a07e49b2f735a7c51db2096041d56a4cd79..2fb04b645665aec9c5e40f96a4286f72cd86421f 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -16,15 +16,16 @@
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private static $parameters = array(
+ 'empty_value' => '',
+ 'some_string' => '-',
+ );
/**
* Constructor.
*/
public function __construct()
{
- $this->parameters = $this->getDefaultParameters();
-
$this->services =
$this->scopedServices =
$this->scopeStacks = array();
@@ -40,6 +41,14 @@ public function __construct()
$this->aliases = array();
}
+ /**
+ * {@inheritdoc}
+ */
+ public function compile()
+ {
+ throw new LogicException('You cannot compile a dumped frozen container.');
+ }
+
/**
* Gets the 'test' service.
*
@@ -60,11 +69,11 @@ public function getParameter($name)
{
$name = strtolower($name);
- if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
- return $this->parameters[$name];
+ return self::$parameters[$name];
}
/**
@@ -74,7 +83,7 @@ public function hasParameter($name)
{
$name = strtolower($name);
- return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
}
/**
@@ -91,21 +100,9 @@ public function setParameter($name, $value)
public function getParameterBag()
{
if (null === $this->parameterBag) {
- $this->parameterBag = new FrozenParameterBag($this->parameters);
+ $this->parameterBag = new FrozenParameterBag(self::$parameters);
}
return $this->parameterBag;
}
- /**
- * Gets the default parameters.
- *
- * @return array An array of the default parameters
- */
- protected function getDefaultParameters()
- {
- return array(
- 'empty_value' => '',
- 'some_string' => '-',
- );
- }
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
new file mode 100644
index 0000000000000000000000000000000000000000..746b3fa7765f9320fc48eeb3dd58763363ce2f5b
--- /dev/null
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -0,0 +1,64 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * ProjectServiceContainer
+ *
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+ private static $parameters = array(
+
+ );
+
+ /**
+ * Constructor.
+ */
+ public function __construct()
+ {
+ parent::__construct(new ParameterBag(self::$parameters));
+ $this->methodMap = array(
+ 'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
+ 'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
+ );
+ }
+
+ /**
+ * Gets the 'service_from_anonymous_factory' service.
+ *
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * @return \Bar\FooClass A Bar\FooClass instance.
+ */
+ protected function getServiceFromAnonymousFactoryService()
+ {
+ return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));
+ }
+
+ /**
+ * Gets the 'service_with_method_call_and_factory' service.
+ *
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * @return \Bar\FooClass A Bar\FooClass instance.
+ */
+ protected function getServiceWithMethodCallAndFactoryService()
+ {
+ $this->services['service_with_method_call_and_factory'] = $instance = new \Bar\FooClass();
+
+ $instance->setBar(\Bar\FooClass::getInstance());
+
+ return $instance;
+ }
+}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index f922d2000c7ed11ac387f2690ee0698ef3ae3df4..7c50647d4e049321444029c34bd486b4930f57d4 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -16,22 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
- /**
- * Constructor.
- */
- public function __construct()
- {
- parent::__construct(new ParameterBag($this->getDefaultParameters()));
- }
-
- /**
- * Gets the default parameters.
- *
- * @return array An array of the default parameters
- */
- protected function getDefaultParameters()
- {
- return array(
+ private static $parameters = array(
'foo' => '%baz%',
'baz' => 'bar',
'bar' => 'foo is %%foo bar',
@@ -47,5 +32,12 @@ protected function getDefaultParameters()
7 => 'null',
),
);
+
+ /**
+ * Constructor.
+ */
+ public function __construct()
+ {
+ parent::__construct(new ParameterBag(self::$parameters));
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
index 8fe63d70567b2d92dff952c8a46f53cde812024f..3cc3aac8b845b3f250abfe34fba8e911d5803f28 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -16,12 +16,18 @@
*/
class ProjectServiceContainer extends Container
{
+ private static $parameters = array(
+ 'baz_class' => 'BazClass',
+ 'foo_class' => 'Bar\\FooClass',
+ 'foo' => 'bar',
+ );
+
/**
* Constructor.
*/
public function __construct()
{
- parent::__construct(new ParameterBag($this->getDefaultParameters()));
+ parent::__construct(new ParameterBag(self::$parameters));
$this->methodMap = array(
'bar' => 'getBarService',
'baz' => 'getBazService',
@@ -38,7 +44,10 @@ public function __construct()
'foo_with_inline' => 'getFooWithInlineService',
'inlined' => 'getInlinedService',
'method_call1' => 'getMethodCall1Service',
+ 'new_factory' => 'getNewFactoryService',
+ 'new_factory_service' => 'getNewFactoryServiceService',
'request' => 'getRequestService',
+ 'service_from_static_method' => 'getServiceFromStaticMethodService',
);
$this->aliases = array(
'alias_for_alias' => 'foo',
@@ -265,6 +274,23 @@ protected function getMethodCall1Service()
return $instance;
}
+ /**
+ * Gets the 'new_factory_service' service.
+ *
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * @return \FooBarBaz A FooBarBaz instance.
+ */
+ protected function getNewFactoryServiceService()
+ {
+ $this->services['new_factory_service'] = $instance = $this->get('new_factory')->getInstance();
+
+ $instance->foo = 'bar';
+
+ return $instance;
+ }
+
/**
* Gets the 'request' service.
*
@@ -278,6 +304,19 @@ protected function getRequestService()
throw new RuntimeException('You have requested a synthetic service ("request"). The DIC does not know how to construct this service.');
}
+ /**
+ * Gets the 'service_from_static_method' service.
+ *
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * @return \Bar\FooClass A Bar\FooClass instance.
+ */
+ protected function getServiceFromStaticMethodService()
+ {
+ return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+ }
+
/**
* Updates the 'request' service.
*/
@@ -332,16 +371,23 @@ protected function getInlinedService()
}
/**
- * Gets the default parameters.
+ * Gets the 'new_factory' service.
*
- * @return array An array of the default parameters
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * This service is private.
+ * If you want to be able to request this service from the container directly,
+ * make it public, otherwise you might end up with broken code.
+ *
+ * @return \FactoryClass A FactoryClass instance.
*/
- protected function getDefaultParameters()
+ protected function getNewFactoryService()
{
- return array(
- 'baz_class' => 'BazClass',
- 'foo_class' => 'Bar\\FooClass',
- 'foo' => 'bar',
- );
+ $this->services['new_factory'] = $instance = new \FactoryClass();
+
+ $instance->foo = 'bar';
+
+ return $instance;
}
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 8962b26398841f3ff2d04776facc1f134d2ab9f3..5e8103bdd0cc9a2845b3a5f880881d120523aa36 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -16,15 +16,17 @@
*/
class ProjectServiceContainer extends Container
{
- private $parameters;
+ private static $parameters = array(
+ 'baz_class' => 'BazClass',
+ 'foo_class' => 'Bar\\FooClass',
+ 'foo' => 'bar',
+ );
/**
* Constructor.
*/
public function __construct()
{
- $this->parameters = $this->getDefaultParameters();
-
$this->services =
$this->scopedServices =
$this->scopeStacks = array();
@@ -46,7 +48,9 @@ public function __construct()
'foo_bar' => 'getFooBarService',
'foo_with_inline' => 'getFooWithInlineService',
'method_call1' => 'getMethodCall1Service',
+ 'new_factory_service' => 'getNewFactoryServiceService',
'request' => 'getRequestService',
+ 'service_from_static_method' => 'getServiceFromStaticMethodService',
);
$this->aliases = array(
'alias_for_alias' => 'foo',
@@ -55,6 +59,14 @@ public function __construct()
);
}
+ /**
+ * {@inheritdoc}
+ */
+ public function compile()
+ {
+ throw new LogicException('You cannot compile a dumped frozen container.');
+ }
+
/**
* Gets the 'bar' service.
*
@@ -261,6 +273,26 @@ protected function getMethodCall1Service()
return $instance;
}
+ /**
+ * Gets the 'new_factory_service' service.
+ *
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * @return \FooBarBaz A FooBarBaz instance.
+ */
+ protected function getNewFactoryServiceService()
+ {
+ $a = new \FactoryClass();
+ $a->foo = 'bar';
+
+ $this->services['new_factory_service'] = $instance = $a->getInstance();
+
+ $instance->foo = 'bar';
+
+ return $instance;
+ }
+
/**
* Gets the 'request' service.
*
@@ -274,6 +306,19 @@ protected function getRequestService()
throw new RuntimeException('You have requested a synthetic service ("request"). The DIC does not know how to construct this service.');
}
+ /**
+ * Gets the 'service_from_static_method' service.
+ *
+ * This service is shared.
+ * This method always returns the same instance of the service.
+ *
+ * @return \Bar\FooClass A Bar\FooClass instance.
+ */
+ protected function getServiceFromStaticMethodService()
+ {
+ return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+ }
+
/**
* Updates the 'request' service.
*/
@@ -291,11 +336,11 @@ public function getParameter($name)
{
$name = strtolower($name);
- if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
- return $this->parameters[$name];
+ return self::$parameters[$name];
}
/**
@@ -305,7 +350,7 @@ public function hasParameter($name)
{
$name = strtolower($name);
- return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
}
/**
@@ -322,22 +367,9 @@ public function setParameter($name, $value)
public function getParameterBag()
{
if (null === $this->parameterBag) {
- $this->parameterBag = new FrozenParameterBag($this->parameters);
+ $this->parameterBag = new FrozenParameterBag(self::$parameters);
}
return $this->parameterBag;
}
- /**
- * Gets the default parameters.
- *
- * @return array An array of the default parameters
- */
- protected function getDefaultParameters()
- {
- return array(
- 'baz_class' => 'BazClass',
- 'foo_class' => 'Bar\\FooClass',
- 'foo' => 'bar',
- );
- }
}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
index a6df4b1432e9996e1534e47a139d4bee21f86de0..121b5bfec66d4cff111ff511e709ed921590d014 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
@@ -52,5 +52,14 @@
<service id="request" class="Request" synthetic="true" synchronized="true" lazy="true"/>
<service id="decorator_service" decorates="decorated" />
<service id="decorator_service_with_name" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
+ <service id="new_factory1" class="FooBarClass">
+ <factory function="factory" />
+ </service>
+ <service id="new_factory2" class="FooBarClass">
+ <factory service="baz" method="getClass" />
+ </service>
+ <service id="new_factory3" class="FooBarClass">
+ <factory class="BazClass" method="getInstance" />
+ </service>
</services>
</container>
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
index 50c48d663c101676289213f8660bd02e3280633e..7234a82cdc4f3645759b883be3d342b9f9985d15 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
@@ -91,6 +91,16 @@
<service id="decorated" class="stdClass"/>
<service id="decorator_service" class="stdClass" decorates="decorated"/>
<service id="decorator_service_with_name" class="stdClass" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
+ <service id="new_factory" class="FactoryClass" public="false">
+ <property name="foo">bar</property>
+ </service>
+ <service id="new_factory_service" class="FooBarBaz">
+ <property name="foo">bar</property>
+ <factory service="new_factory" method="getInstance"/>
+ </service>
+ <service id="service_from_static_method" class="Bar\FooClass">
+ <factory class="Bar\FooClass" method="getInstance"/>
+ </service>
<service id="alias_for_foo" alias="foo"/>
<service id="alias_for_alias" alias="foo"/>
</services>
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services14.yml b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services14.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4c188c5fbc7b0ad3a8c76f94e0b2102ca389f35b
--- /dev/null
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services14.yml
@@ -0,0 +1,3 @@
+services:
+ factory: { class: FooBarClass, factory: baz:getClass}
+ factory_with_static_call: { class: FooBarClass, factory: FooBacFactory::createFooBar}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
index 7c1a62c327847011e900347c893a51f922fd61ed..398604a553148ffefb6c7b739efbf73daceb8851 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -35,3 +35,6 @@ services:
decorator_service_with_name:
decorates: decorated
decoration_inner_name: decorated.pif-pouf
+ new_factory1: { class: FooBarClass, factory: factory}
+ new_factory2: { class: FooBarClass, factory: [@baz, getClass]}
+ new_factory3: { class: FooBarClass, factory: [BazClass, getInstance]}
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index 52bfb0dc4c5e054ef057aeebc9eef1ee731e4a7e..0b8da43968787098b50ce061d51f0d4bede76b24 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -88,5 +88,16 @@ services:
class: stdClass
decorates: decorated
decoration_inner_name: decorated.pif-pouf
+ new_factory:
+ class: FactoryClass
+ public: false
+ properties: { foo: bar }
+ new_factory_service:
+ class: FooBarBaz
+ properties: { foo: bar }
+ factory: ['@new_factory', getInstance]
+ service_from_static_method:
+ class: Bar\FooClass
+ factory: [Bar\FooClass, getInstance]
alias_for_foo: @foo
alias_for_alias: @foo
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
index 5fb202696492a65c2151d09ca24bfe14d55c773e..bc0c5800e1cfd2bdb8ac12dcc272af7ec71f7817 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
@@ -26,9 +26,9 @@ class RealServiceInstantiatorTest extends \PHPUnit_Framework_TestCase
public function testInstantiateProxy()
{
$instantiator = new RealServiceInstantiator();
- $instance = new \stdClass();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
- $callback = function () use ($instance) {
+ $instance = new \stdClass();
+ $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $callback = function () use ($instance) {
return $instance;
};
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/NullDumperTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
index 646673662a61c54d581a2aa5135eaa61a828c9a3..4eb8320b644b75ef3fd833323ed7292d34661ff8 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
@@ -25,7 +25,7 @@ class NullDumperTest extends \PHPUnit_Framework_TestCase
{
public function testNullDumper()
{
- $dumper = new NullDumper();
+ $dumper = new NullDumper();
$definition = new Definition('stdClass');
$this->assertFalse($dumper->isProxyCandidate($definition));
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
index b9f402b70189f7aac1908d93dcbde5af5e3ed540..9188018b2b7db2fed18799a66c783b420aa1b572 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
@@ -30,7 +30,7 @@ public static function setUpBeforeClass()
protected function setUp()
{
$this->container = new ContainerBuilder();
- $this->loader = new IniFileLoader($this->container, new FileLocator(self::$fixturesPath.'/ini'));
+ $this->loader = new IniFileLoader($this->container, new FileLocator(self::$fixturesPath.'/ini'));
}
/**
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index db6598e671a80a33156e0e49d547712f4c0de1a7..6d3e48752ce954d409821d8cbcf40607d73b11a4 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -216,6 +216,9 @@ public function testLoadServices()
$this->assertNull($services['factory_service']->getClass());
$this->assertEquals('getInstance', $services['factory_service']->getFactoryMethod());
$this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
+ $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
+ $this->assertEquals(array(new Reference('baz', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
+ $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
$this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
$this->assertTrue($services['request']->isSynchronized(), '->load() parses the synchronized flag');
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 57b308766610cfeb70dda1f612dd3838691abe66..3de0843dfbdfb050ed286c0d31de99f79ba38698 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -141,6 +141,9 @@ public function testLoadServices()
$this->assertEquals(array(array('setBar', array()), array('setBar', array()), array('setBar', array(new Expression('service("foo").foo() ~ (container.hasparameter("foo") ? parameter("foo") : "default")')))), $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
$this->assertEquals(array(array('setBar', array('foo', new Reference('foo'), array(true, false)))), $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
$this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
+ $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
+ $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
+ $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
$this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
$this->assertTrue($services['request']->isSynchronized(), '->load() parses the synchronized flag');
@@ -159,6 +162,17 @@ public function testLoadServices()
$this->assertEquals(array('decorated', 'decorated.pif-pouf'), $services['decorator_service_with_name']->getDecoratedService());
}
+ public function testLoadFactoryShortSyntax()
+ {
+ $container = new ContainerBuilder();
+ $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+ $loader->load('services14.yml');
+ $services = $container->getDefinitions();
+
+ $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['factory']->getFactory(), '->load() parses the factory tag with service:method');
+ $this->assertEquals(array('FooBacFactory', 'createFooBar'), $services['factory_with_static_call']->getFactory(), '->load() parses the factory tag with Class::method');
+ }
+
public function testExtensions()
{
$container = new ContainerBuilder();
diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json
index 2190101fa2c9f69a7246e28f62f412bffcd45000..c0090495a1bfff7936203b983b3dda2c72849064 100644
--- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json
+++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json
@@ -35,7 +35,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index e97d427ea15ebd0ad478e49e4808665664de717c..f19dc5d33b79b0a3a4ff99bedb4f4542c98be478 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -76,21 +76,18 @@ public function removeListener($eventName, $listener)
{
$this->lazyLoad($eventName);
- if (isset($this->listeners[$eventName])) {
- foreach ($this->listeners[$eventName] as $key => $l) {
- foreach ($this->listenerIds[$eventName] as $i => $args) {
- list($serviceId, $method, $priority) = $args;
- if ($key === $serviceId.'.'.$method) {
- if ($listener === array($l, $method)) {
- unset($this->listeners[$eventName][$key]);
- if (empty($this->listeners[$eventName])) {
- unset($this->listeners[$eventName]);
- }
- unset($this->listenerIds[$eventName][$i]);
- if (empty($this->listenerIds[$eventName])) {
- unset($this->listenerIds[$eventName]);
- }
- }
+ if (isset($this->listenerIds[$eventName])) {
+ foreach ($this->listenerIds[$eventName] as $i => $args) {
+ list($serviceId, $method, $priority) = $args;
+ $key = $serviceId.'.'.$method;
+ if (isset($this->listeners[$eventName][$key]) && $listener === array($this->listeners[$eventName][$key], $method)) {
+ unset($this->listeners[$eventName][$key]);
+ if (empty($this->listeners[$eventName])) {
+ unset($this->listeners[$eventName]);
+ }
+ unset($this->listenerIds[$eventName][$i]);
+ if (empty($this->listenerIds[$eventName])) {
+ unset($this->listenerIds[$eventName]);
}
}
}
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index b797667208bb5967a8934732e15391484ce17a8e..347c7d07399a9c3e37ccbb8eb1d1ed082850cbf6 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -283,10 +283,10 @@ private function getListenerInfo($listener, $eventName)
$line = null;
}
$info += array(
- 'type' => 'Function',
+ 'type' => 'Function',
'function' => $listener,
- 'file' => $file,
- 'line' => $line,
+ 'file' => $file,
+ 'line' => $line,
'pretty' => $listener,
);
} elseif (is_array($listener) || (is_object($listener) && is_callable($listener))) {
@@ -303,11 +303,11 @@ private function getListenerInfo($listener, $eventName)
$line = null;
}
$info += array(
- 'type' => 'Method',
+ 'type' => 'Method',
'class' => $class,
'method' => $listener[1],
- 'file' => $file,
- 'line' => $line,
+ 'file' => $file,
+ 'line' => $line,
'pretty' => $class.'::'.$listener[1],
);
}
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
index 3fdbfd8822e3d61ea69f1064fd3fb20e6ecb2ce8..c85ebdafc15a2553fe1902859a53ba0373382cc9 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -64,8 +64,8 @@ public function addSubscriber(EventSubscriberInterface $subscriber);
/**
* Removes an event listener from the specified events.
*
- * @param string|array $eventName The event(s) to remove a listener from
- * @param callable $listener The listener to remove
+ * @param string $eventName The event to remove a listener from
+ * @param callable $listener The listener to remove
*/
public function removeListener($eventName, $listener);
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md
index 22bf74fdc9d66f38a250218276cc6d0b492806ce..c928f136692be8f5b70cbd12c22fa69884267e0d 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md
@@ -4,16 +4,18 @@ EventDispatcher Component
The Symfony2 EventDispatcher component implements the Mediator pattern in a
simple and effective way to make your projects truly extensible.
- use Symfony\Component\EventDispatcher\EventDispatcher;
- use Symfony\Component\EventDispatcher\Event;
+```php
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
- $dispatcher = new EventDispatcher();
+$dispatcher = new EventDispatcher();
- $dispatcher->addListener('event_name', function (Event $event) {
- // ...
- });
+$dispatcher->addListener('event_name', function (Event $event) {
+ // ...
+});
- $dispatcher->dispatch('event_name');
+$dispatcher->dispatch('event_name');
+```
Resources
---------
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
index fb3b4caa266240cd6c70129eb194829bde06832e..eabde3da8e12b5411e28cc8540b60495c5503e36 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
@@ -232,8 +232,6 @@ class SubscriberService implements EventSubscriberInterface
public static function getSubscribedEvents()
{
return array(
- 'onEvent' => 'onEvent',
- 'onEvent' => array('onEvent', 10),
'onEvent' => array('onEvent'),
);
}
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
index 9c5ee5f7e9d8d0710f9d90a4e12e26b805a73d27..b291e1ee3c47d8d4c563f94a6a7be59ca2b28dc8 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -37,7 +37,10 @@ public function testEventSubscriberWithoutInterface()
->method('getClass')
->will($this->returnValue('stdClass'));
- $builder = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+ $builder = $this->getMock(
+ 'Symfony\Component\DependencyInjection\ContainerBuilder',
+ array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
+ );
$builder->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
@@ -69,7 +72,10 @@ public function testValidEventSubscriber()
->method('getClass')
->will($this->returnValue('Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService'));
- $builder = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+ $builder = $this->getMock(
+ 'Symfony\Component\DependencyInjection\ContainerBuilder',
+ array('hasDefinition', 'findTaggedServiceIds', 'getDefinition', 'findDefinition')
+ );
$builder->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
index 2bd0750b141608a5f3ad29a6e378d2291e94d1a0..da246f1c6c8ef06b5b2eeef119f73622fb7395c4 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
@@ -99,7 +99,7 @@ public function testGetAllListenersSortsByPriority()
$this->dispatcher->addListener('post.foo', $listener6, 10);
$expected = array(
- 'pre.foo' => array($listener3, $listener2, $listener1),
+ 'pre.foo' => array($listener3, $listener2, $listener1),
'post.foo' => array($listener6, $listener5, $listener4),
);
diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
index 75fd243d529ea6e475fef02dfd4b563de1c9dd2d..80a0f93c7b14cea7e09ad3a6d64250e81503f820 100644
--- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
+++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
@@ -19,7 +19,8 @@
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/dependency-injection": "~2.0,<2.6.0",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
"symfony/config": "~2.0",
"symfony/stopwatch": "~2.2",
"psr/log": "~1.0"
@@ -35,7 +36,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index bcd4c40f30b5eb5d0be2cad0cce3f8a1c6927c03..bf8ef840b96a9f8f44c87ee1b2c3de644d17c592 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -30,6 +30,7 @@ class BinaryFileResponse extends Response
protected $file;
protected $offset;
protected $maxlen;
+ protected $deleteFileAfterSend = false;
/**
* Constructor.
@@ -264,6 +265,10 @@ public function sendContent()
fclose($out);
fclose($file);
+
+ if ($this->deleteFileAfterSend) {
+ unlink($this->file->getPathname());
+ }
}
/**
@@ -295,4 +300,18 @@ public static function trustXSendfileTypeHeader()
{
self::$trustXSendfileTypeHeader = true;
}
+
+ /**
+ * If this is set to true, the file will be unlinked after the request is send
+ * Note: If the X-Sendfile header is used, the deleteFileAfterSend setting will not be used.
+ * @param bool $shouldDelete
+ *
+ * @return BinaryFileResponse
+ */
+ public function deleteFileAfterSend($shouldDelete)
+ {
+ $this->deleteFileAfterSend = $shouldDelete;
+
+ return $this;
+ }
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md
index 0da734bce2f1ce1d919165404cd574a7909b8507..dcdeb4ebf96640d342d22a5bb87c5f103a23671a 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -1,6 +1,17 @@
CHANGELOG
=========
+2.6.0
+-----
+
+ * PdoSessionHandler changes
+ - implemented different session locking strategies to prevent loss of data by concurrent access to the same session
+ - [BC BREAK] save session data in a binary column without base64_encode
+ - [BC BREAK] added lifetime column to the session table which allows to have different lifetimes for each session
+ - implemented lazy connections that are only opened when a session is used by either passing a dsn string
+ explicitly or falling back to session.save_path ini setting
+ - added a createTable method that initializes a correctly defined table depending on the database vendor
+
2.5.0
-----
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php
index 31f349c759a95bcaa0bccd150d15f6ebf763e180..955dec34e557857584302109c03694a2088ababc 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -291,13 +291,13 @@ public static function getMaxFilesize()
public function getErrorMessage()
{
static $errors = array(
- UPLOAD_ERR_INI_SIZE => 'The file "%s" exceeds your upload_max_filesize ini directive (limit is %d KiB).',
- UPLOAD_ERR_FORM_SIZE => 'The file "%s" exceeds the upload limit defined in your form.',
- UPLOAD_ERR_PARTIAL => 'The file "%s" was only partially uploaded.',
- UPLOAD_ERR_NO_FILE => 'No file was uploaded.',
+ UPLOAD_ERR_INI_SIZE => 'The file "%s" exceeds your upload_max_filesize ini directive (limit is %d KiB).',
+ UPLOAD_ERR_FORM_SIZE => 'The file "%s" exceeds the upload limit defined in your form.',
+ UPLOAD_ERR_PARTIAL => 'The file "%s" was only partially uploaded.',
+ UPLOAD_ERR_NO_FILE => 'No file was uploaded.',
UPLOAD_ERR_CANT_WRITE => 'The file "%s" could not be written on disk.',
UPLOAD_ERR_NO_TMP_DIR => 'File could not be uploaded: missing temporary directory.',
- UPLOAD_ERR_EXTENSION => 'File upload was stopped by a PHP extension.',
+ UPLOAD_ERR_EXTENSION => 'File upload was stopped by a PHP extension.',
);
$errorCode = $this->error;
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php
index 699e408d02ab0514ebab15f83b78c8afb263a12c..467c31576b586563f0f5188fc90a60ffcc876492 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php
@@ -142,11 +142,11 @@ protected function fixPhpFilesArray($data)
foreach (array_keys($data['name']) as $key) {
$files[$key] = $this->fixPhpFilesArray(array(
- 'error' => $data['error'][$key],
- 'name' => $data['name'][$key],
- 'type' => $data['type'][$key],
+ 'error' => $data['error'][$key],
+ 'name' => $data['name'][$key],
+ 'type' => $data['type'][$key],
'tmp_name' => $data['tmp_name'][$key],
- 'size' => $data['size'][$key],
+ 'size' => $data['size'][$key],
));
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php
index 8791275bafdaa323e393e2c2691327564bf1428d..18ca3ea547006ebd90efd9d865c180a5a8a1c69b 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -253,6 +253,20 @@ public function getInt($key, $default = 0, $deep = false)
return (int) $this->get($key, $default, $deep);
}
+ /**
+ * Returns the parameter value converted to boolean.
+ *
+ * @param string $key The parameter key
+ * @param mixed $default The default value if the parameter key does not exist
+ * @param bool $deep If true, a path like foo[bar] will find deeper items
+ *
+ * @return bool The filtered value
+ */
+ public function getBoolean($key, $default = false, $deep = false)
+ {
+ return $this->filter($key, $default, $deep, FILTER_VALIDATE_BOOLEAN);
+ }
+
/**
* Filter key.
*
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md
index ea6a790a641a3095f36e243600e3061c770fbe47..008c1587f6f92c8fb6f4b515cab8faa28c9c763c 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md
@@ -9,21 +9,27 @@ sessions, ...
In this example, we get a Request object from the current PHP global
variables:
- use Symfony\Component\HttpFoundation\Request;
- use Symfony\Component\HttpFoundation\Response;
+```php
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
- $request = Request::createFromGlobals();
- echo $request->getPathInfo();
+$request = Request::createFromGlobals();
+echo $request->getPathInfo();
+```
You can also create a Request directly -- that's interesting for unit testing:
- $request = Request::create('/?foo=bar', 'GET');
- echo $request->getPathInfo();
+```php
+$request = Request::create('/?foo=bar', 'GET');
+echo $request->getPathInfo();
+```
And here is how to create and send a Response:
- $response = new Response('Not Found', 404, array('Content-Type' => 'text/plain'));
- $response->send();
+```php
+$response = new Response('Not Found', 404, array('Content-Type' => 'text/plain'));
+$response->send();
+```
The Request and the Response classes have many other methods that implement
the HTTP specification.
@@ -33,10 +39,12 @@ Loading
If you are not using Composer but are using PHP 5.3.x, you must add the following to your autoloader:
- // SessionHandlerInterface
- if (!interface_exists('SessionHandlerInterface')) {
- $loader->registerPrefixFallback(__DIR__.'/../vendor/symfony/src/Symfony/Component/HttpFoundation/Resources/stubs');
- }
+```php
+// SessionHandlerInterface
+if (!interface_exists('SessionHandlerInterface')) {
+ $loader->registerPrefixFallback(__DIR__.'/../vendor/symfony/src/Symfony/Component/HttpFoundation/Resources/stubs');
+}
+```
Resources
---------
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php
index 641bd93f630a7171f5488edcc0d5fbb38241bce0..ccd50f7eca313c8f1a1c8f7b97ad21635ac0db14 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php
@@ -89,7 +89,7 @@ public function setTargetUrl($url)
sprintf('<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta charset="UTF-8" />
<meta http-equiv="refresh" content="1;url=%1$s" />
<title>Redirecting to %1$s</title>
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php
index 98c747306ca6ffcd9efd99804285d5fe25d4572e..16d1549caaf0d7525876b235b47f1b62ae8a39d6 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php
@@ -30,10 +30,21 @@
*/
class Request
{
- const HEADER_CLIENT_IP = 'client_ip';
- const HEADER_CLIENT_HOST = 'client_host';
+ const HEADER_CLIENT_IP = 'client_ip';
+ const HEADER_CLIENT_HOST = 'client_host';
const HEADER_CLIENT_PROTO = 'client_proto';
- const HEADER_CLIENT_PORT = 'client_port';
+ const HEADER_CLIENT_PORT = 'client_port';
+
+ const METHOD_HEAD = 'HEAD';
+ const METHOD_GET = 'GET';
+ const METHOD_POST = 'POST';
+ const METHOD_PUT = 'PUT';
+ const METHOD_PATCH = 'PATCH';
+ const METHOD_DELETE = 'DELETE';
+ const METHOD_PURGE = 'PURGE';
+ const METHOD_OPTIONS = 'OPTIONS';
+ const METHOD_TRACE = 'TRACE';
+ const METHOD_CONNECT = 'CONNECT';
protected static $trustedProxies = array();
@@ -55,10 +66,10 @@ class Request
* by popular reverse proxies (like Apache mod_proxy or Amazon EC2).
*/
protected static $trustedHeaders = array(
- self::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
- self::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
+ self::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
+ self::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
self::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
- self::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
+ self::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
);
protected static $httpMethodParameterOverride = false;
@@ -301,18 +312,18 @@ public static function createFromGlobals()
public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
{
$server = array_replace(array(
- 'SERVER_NAME' => 'localhost',
- 'SERVER_PORT' => 80,
- 'HTTP_HOST' => 'localhost',
- 'HTTP_USER_AGENT' => 'Symfony/2.X',
- 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+ 'SERVER_NAME' => 'localhost',
+ 'SERVER_PORT' => 80,
+ 'HTTP_HOST' => 'localhost',
+ 'HTTP_USER_AGENT' => 'Symfony/2.X',
+ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.5',
- 'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
- 'REMOTE_ADDR' => '127.0.0.1',
- 'SCRIPT_NAME' => '',
- 'SCRIPT_FILENAME' => '',
- 'SERVER_PROTOCOL' => 'HTTP/1.1',
- 'REQUEST_TIME' => time(),
+ 'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+ 'REMOTE_ADDR' => '127.0.0.1',
+ 'SCRIPT_NAME' => '',
+ 'SCRIPT_FILENAME' => '',
+ 'SERVER_PROTOCOL' => 'HTTP/1.1',
+ 'REQUEST_TIME' => time(),
), $server);
$server['PATH_INFO'] = '';
@@ -470,13 +481,13 @@ public function duplicate(array $query = null, array $request = null, array $att
*/
public function __clone()
{
- $this->query = clone $this->query;
- $this->request = clone $this->request;
+ $this->query = clone $this->query;
+ $this->request = clone $this->request;
$this->attributes = clone $this->attributes;
- $this->cookies = clone $this->cookies;
- $this->files = clone $this->files;
- $this->server = clone $this->server;
- $this->headers = clone $this->headers;
+ $this->cookies = clone $this->cookies;
+ $this->files = clone $this->files;
+ $this->server = clone $this->server;
+ $this->headers = clone $this->headers;
}
/**
@@ -496,7 +507,7 @@ public function __toString()
* Overrides the PHP global variables according to this request instance.
*
* It overrides $_GET, $_POST, $_REQUEST, $_SERVER, $_COOKIE.
- * $_FILES is never override, see rfc1867
+ * $_FILES is never overridden, see rfc1867
*
* @api
*/
@@ -671,6 +682,9 @@ public static function normalizeQueryString($qs)
*
* Be warned that enabling this feature might lead to CSRF issues in your code.
* Check that you are using CSRF tokens when required.
+ * If the HTTP method parameter override is enabled, an html-form with method "POST" can be altered
+ * and used to send a "PUT" or "DELETE" request via the _method request parameter.
+ * If these methods are not protected against CSRF, this presents a possible vulnerability.
*
* The HTTP method can only be overridden when the real HTTP method is POST.
*/
@@ -1023,7 +1037,7 @@ public function getUserInfo()
public function getHttpHost()
{
$scheme = $this->getScheme();
- $port = $this->getPort();
+ $port = $this->getPort();
if (('http' == $scheme && $port == 80) || ('https' == $scheme && $port == 443)) {
return $this->getHost();
@@ -1612,7 +1626,7 @@ public function getAcceptableContentTypes()
/**
* Returns true if the request is a XMLHttpRequest.
*
- * It works if your JavaScript library set an X-Requested-With HTTP header.
+ * It works if your JavaScript library sets an X-Requested-With HTTP header.
* It is known to work with common JavaScript frameworks:
* @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
*
@@ -1693,15 +1707,15 @@ protected function prepareBaseUrl()
} else {
// Backtrack up the script_filename to find the portion matching
// php_self
- $path = $this->server->get('PHP_SELF', '');
- $file = $this->server->get('SCRIPT_FILENAME', '');
- $segs = explode('/', trim($file, '/'));
- $segs = array_reverse($segs);
- $index = 0;
- $last = count($segs);
+ $path = $this->server->get('PHP_SELF', '');
+ $file = $this->server->get('SCRIPT_FILENAME', '');
+ $segs = explode('/', trim($file, '/'));
+ $segs = array_reverse($segs);
+ $index = 0;
+ $last = count($segs);
$baseUrl = '';
do {
- $seg = $segs[$index];
+ $seg = $segs[$index];
$baseUrl = '/'.$seg.$baseUrl;
++$index;
} while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
@@ -1804,14 +1818,15 @@ protected static function initializeFormats()
{
static::$formats = array(
'html' => array('text/html', 'application/xhtml+xml'),
- 'txt' => array('text/plain'),
- 'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
- 'css' => array('text/css'),
+ 'txt' => array('text/plain'),
+ 'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
+ 'css' => array('text/css'),
'json' => array('application/json', 'application/x-json'),
- 'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
- 'rdf' => array('application/rdf+xml'),
+ 'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
+ 'rdf' => array('application/rdf+xml'),
'atom' => array('application/atom+xml'),
- 'rss' => array('application/rss+xml'),
+ 'rss' => array('application/rss+xml'),
+ 'form' => array('application/x-www-form-urlencoded'),
);
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php
index da95c3acc14d89226a306ab54d9712e8115d6787..c571c604b4f1227f359dc6d3c44de3600374210e 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -45,24 +45,42 @@ class RequestMatcher implements RequestMatcherInterface
*/
private $attributes = array();
+ /**
+ * @var string[]
+ */
+ private $schemes = array();
+
/**
* @param string|null $path
* @param string|null $host
* @param string|string[]|null $methods
* @param string|string[]|null $ips
* @param array $attributes
+ * @param string|string[]|null $schemes
*/
- public function __construct($path = null, $host = null, $methods = null, $ips = null, array $attributes = array())
+ public function __construct($path = null, $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null)
{
$this->matchPath($path);
$this->matchHost($host);
$this->matchMethod($methods);
$this->matchIps($ips);
+ $this->matchScheme($schemes);
+
foreach ($attributes as $k => $v) {
$this->matchAttribute($k, $v);
}
}
+ /**
+ * Adds a check for the HTTP scheme.
+ *
+ * @param string|string[]|null $scheme An HTTP scheme or an array of HTTP schemes
+ */
+ public function matchScheme($scheme)
+ {
+ $this->schemes = array_map('strtolower', (array) $scheme);
+ }
+
/**
* Adds a check for the URL host name.
*
@@ -106,7 +124,7 @@ public function matchIps($ips)
/**
* Adds a check for the HTTP method.
*
- * @param string|string[]|null $method An HTTP method or an array of HTTP methods
+ * @param string|string[] $method An HTTP method or an array of HTTP methods
*/
public function matchMethod($method)
{
@@ -131,6 +149,10 @@ public function matchAttribute($key, $regexp)
*/
public function matches(Request $request)
{
+ if ($this->schemes && !in_array($request->getScheme(), $this->schemes)) {
+ return false;
+ }
+
if ($this->methods && !in_array($request->getMethod(), $this->methods)) {
return false;
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
index 24280e38fca4ad7607aecef7ea42d72a1e9a0408..9557135bcfbd159efadac59ea846912c8b7e53be 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
@@ -12,6 +12,14 @@
/**
* SessionHandlerInterface for PHP < 5.4
*
+ * The order in which these methods are invoked by PHP are:
+ * 1. open [session_start]
+ * 2. read
+ * 3. gc [optional depending on probability settings: gc_probability / gc_divisor]
+ * 4. destroy [optional when session_regenerate_id(true) is used]
+ * 5. write [session_write_close] or destroy [session_destroy]
+ * 6. close
+ *
* Extensive documentation can be found at php.net, see links:
*
* @see http://php.net/sessionhandlerinterface
@@ -19,6 +27,7 @@
* @see http://php.net/session-set-save-handler
*
* @author Drak <drak@zikula.org>
+ * @author Tobias Schultze <http://tobion.de>
*/
interface SessionHandlerInterface
{
@@ -57,6 +66,9 @@ public function read($sessionId);
/**
* Writes the session data to the storage.
*
+ * Care, the session ID passed to write() can be different from the one previously
+ * received in read() when the session ID changed due to session_regenerate_id().
+ *
* @see http://php.net/sessionhandlerinterface.write
*
* @param string $sessionId Session ID , see http://php.net/function.session-id
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php
index fbb86f6edd86255496f0263affe812fca1c043f3..f2a5ceb9951fa31d27dc0bc1821ceb6015958acd 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php
@@ -1077,8 +1077,8 @@ public function isNotModified(Request $request)
return false;
}
- $notModified = false;
- $lastModified = $this->headers->get('Last-Modified');
+ $notModified = false;
+ $lastModified = $this->headers->get('Last-Modified');
$modifiedSince = $request->headers->get('If-Modified-Since');
if ($etags = $request->getEtags()) {
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index f52f048875f2cea794074e15ca9c86ee63b83684..603515c552c7109c1a82138ddff363504ba358e1 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -20,11 +20,11 @@
*/
class ResponseHeaderBag extends HeaderBag
{
- const COOKIES_FLAT = 'flat';
- const COOKIES_ARRAY = 'array';
+ const COOKIES_FLAT = 'flat';
+ const COOKIES_ARRAY = 'array';
const DISPOSITION_ATTACHMENT = 'attachment';
- const DISPOSITION_INLINE = 'inline';
+ const DISPOSITION_INLINE = 'inline';
/**
* @var array
@@ -34,12 +34,12 @@ class ResponseHeaderBag extends HeaderBag
/**
* @var array
*/
- protected $cookies = array();
+ protected $cookies = array();
/**
* @var array
*/
- protected $headerNames = array();
+ protected $headerNames = array();
/**
* Constructor.
@@ -229,12 +229,14 @@ public function getCookies($format = self::COOKIES_FLAT)
* @param string $name
* @param string $path
* @param string $domain
+ * @param bool $secure
+ * @param bool $httpOnly
*
* @api
*/
- public function clearCookie($name, $path = '/', $domain = null)
+ public function clearCookie($name, $path = '/', $domain = null, $secure = false, $httpOnly = true)
{
- $this->setCookie(new Cookie($name, null, 1, $path, $domain));
+ $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly));
}
/**
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 9579a74c6ec7b8d1fe9eacc01226c930ae527115..eb35e5aa3121e5cc55bf99b3bad8429f791cf1fe 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -62,9 +62,10 @@ public function __construct($mongo, array $options)
$this->mongo = $mongo;
$this->options = array_merge(array(
- 'id_field' => '_id',
+ 'id_field' => '_id',
'data_field' => 'data',
'time_field' => 'time',
+ 'expiry_field' => false,
), $options);
}
@@ -109,6 +110,9 @@ public function gc($maxlifetime)
*
* See: http://docs.mongodb.org/manual/tutorial/expire-data/
*/
+ if (false !== $this->options['expiry_field']) {
+ return true;
+ }
$time = new \MongoDate(time() - $maxlifetime);
$this->getCollection()->remove(array(
@@ -123,12 +127,27 @@ public function gc($maxlifetime)
*/
public function write($sessionId, $data)
{
+ $fields = array(
+ $this->options['data_field'] => new \MongoBinData($data, \MongoBinData::BYTE_ARRAY),
+ $this->options['time_field'] => new \MongoDate(),
+ );
+
+ /* Note: As discussed in the gc method of this class. You can utilise
+ * TTL collections in MongoDB 2.2+
+ * We are setting the "expiry_field" as part of the write operation here
+ * You will need to create the index on your collection that expires documents
+ * at that time
+ * e.g.
+ * db.MySessionCollection.ensureIndex( { "expireAt": 1 }, { expireAfterSeconds: 0 } )
+ */
+ if (false !== $this->options['expiry_field']) {
+ $expiry = new \MongoDate(time() + (int) ini_get('session.gc_maxlifetime'));
+ $fields[$this->options['expiry_field']] = $expiry;
+ }
+
$this->getCollection()->update(
array($this->options['id_field'] => $sessionId),
- array('$set' => array(
- $this->options['data_field'] => new \MongoBinData($data, \MongoBinData::BYTE_ARRAY),
- $this->options['time_field'] => new \MongoDate(),
- )),
+ array('$set' => $fields),
array('upsert' => true, 'multiple' => false)
);
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index c6e4eb3c0692818023c899a40b666b4730baa185..32b73968db686afb9c784e690238aa5089e975e3 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -14,11 +14,25 @@
/**
* Session handler using a PDO connection to read and write data.
*
+ * It works with MySQL, PostgreSQL, Oracle, SQL Server and SQLite and implements
+ * different locking strategies to handle concurrent access to the same session.
+ * Locking is necessary to prevent loss of data due to race conditions and to keep
+ * the session data consistent between read() and write(). With locking, requests
+ * for the same session will wait until the other one finished writing. For this
+ * reason it's best practice to close a session as early as possible to improve
+ * concurrency. PHPs internal files session handler also implements locking.
+ *
+ * Attention: Since SQLite does not support row level locks but locks the whole database,
+ * it means only one session can be accessed at a time. Even different sessions would wait
+ * for another to finish. So saving session in SQLite should only be considered for
+ * development or prototypes.
+ *
* Session data is a binary string that can contain non-printable characters like the null byte.
- * For this reason this handler base64 encodes the data to be able to save it in a character column.
+ * For this reason it must be saved in a binary column in the database like BLOB in MySQL.
+ * Saving it in a character column could corrupt the data. You can use createTable()
+ * to initialize a correctly defined table.
*
- * This version of the PdoSessionHandler does NOT implement locking. So concurrent requests to the
- * same session can result in data loss due to race conditions.
+ * @see http://php.net/sessionhandlerinterface
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Michael Williams <michael.williams@funsational.com>
@@ -27,98 +41,246 @@
class PdoSessionHandler implements \SessionHandlerInterface
{
/**
- * @var \PDO PDO instance
+ * No locking is done. This means sessions are prone to loss of data due to
+ * race conditions of concurrent requests to the same session. The last session
+ * write will win in this case. It might be useful when you implement your own
+ * logic to deal with this like an optimistic approach.
+ */
+ const LOCK_NONE = 0;
+
+ /**
+ * Creates an application-level lock on a session. The disadvantage is that the
+ * lock is not enforced by the database and thus other, unaware parts of the
+ * application could still concurrently modify the session. The advantage is it
+ * does not require a transaction.
+ * This mode is not available for SQLite and not yet implemented for oci and sqlsrv.
+ */
+ const LOCK_ADVISORY = 1;
+
+ /**
+ * Issues a real row lock. Since it uses a transaction between opening and
+ * closing a session, you have to be careful when you use same database connection
+ * that you also use for your application logic. This mode is the default because
+ * it's the only reliable solution across DBMSs.
+ */
+ const LOCK_TRANSACTIONAL = 2;
+
+ /**
+ * @var \PDO|null PDO instance or null when not connected yet
*/
private $pdo;
+ /**
+ * @var string|null|false DSN string or null for session.save_path or false when lazy connection disabled
+ */
+ private $dsn = false;
+
+ /**
+ * @var string Database driver
+ */
+ private $driver;
+
/**
* @var string Table name
*/
- private $table;
+ private $table = 'sessions';
/**
* @var string Column for session id
*/
- private $idCol;
+ private $idCol = 'sess_id';
/**
* @var string Column for session data
*/
- private $dataCol;
+ private $dataCol = 'sess_data';
+
+ /**
+ * @var string Column for lifetime
+ */
+ private $lifetimeCol = 'sess_lifetime';
/**
* @var string Column for timestamp
*/
- private $timeCol;
+ private $timeCol = 'sess_time';
+
+ /**
+ * @var string Username when lazy-connect
+ */
+ private $username = '';
+
+ /**
+ * @var string Password when lazy-connect
+ */
+ private $password = '';
+
+ /**
+ * @var array Connection options when lazy-connect
+ */
+ private $connectionOptions = array();
+
+ /**
+ * @var int The strategy for locking, see constants
+ */
+ private $lockMode = self::LOCK_TRANSACTIONAL;
+
+ /**
+ * It's an array to support multiple reads before closing which is manual, non-standard usage
+ *
+ * @var \PDOStatement[] An array of statements to release advisory locks
+ */
+ private $unlockStatements = array();
+
+ /**
+ * @var bool True when the current session exists but expired according to session.gc_maxlifetime
+ */
+ private $sessionExpired = false;
+
+ /**
+ * @var bool Whether a transaction is active
+ */
+ private $inTransaction = false;
+
+ /**
+ * @var bool Whether gc() has been called
+ */
+ private $gcCalled = false;
/**
* Constructor.
*
+ * You can either pass an existing database connection as PDO instance or
+ * pass a DSN string that will be used to lazy-connect to the database
+ * when the session is actually used. Furthermore it's possible to pass null
+ * which will then use the session.save_path ini setting as PDO DSN parameter.
+ *
* List of available options:
- * * db_table: The name of the table [required]
+ * * db_table: The name of the table [default: sessions]
* * db_id_col: The column where to store the session id [default: sess_id]
* * db_data_col: The column where to store the session data [default: sess_data]
+ * * db_lifetime_col: The column where to store the lifetime [default: sess_lifetime]
* * db_time_col: The column where to store the timestamp [default: sess_time]
+ * * db_username: The username when lazy-connect [default: '']
+ * * db_password: The password when lazy-connect [default: '']
+ * * db_connection_options: An array of driver-specific connection options [default: array()]
+ * * lock_mode: The strategy for locking, see constants [default: LOCK_TRANSACTIONAL]
*
- * @param \PDO $pdo A \PDO instance
- * @param array $dbOptions An associative array of DB options
+ * @param \PDO|string|null $pdoOrDsn A \PDO instance or DSN string or null
+ * @param array $options An associative array of options
*
- * @throws \InvalidArgumentException When "db_table" option is not provided
+ * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
*/
- public function __construct(\PDO $pdo, array $dbOptions = array())
+ public function __construct($pdoOrDsn = null, array $options = array())
{
- if (!array_key_exists('db_table', $dbOptions)) {
- throw new \InvalidArgumentException('You must provide the "db_table" option for a PdoSessionStorage.');
+ if ($pdoOrDsn instanceof \PDO) {
+ if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
+ throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
+ }
+
+ $this->pdo = $pdoOrDsn;
+ $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+ } else {
+ $this->dsn = $pdoOrDsn;
}
- if (\PDO::ERRMODE_EXCEPTION !== $pdo->getAttribute(\PDO::ATTR_ERRMODE)) {
- throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
+
+ $this->table = isset($options['db_table']) ? $options['db_table'] : $this->table;
+ $this->idCol = isset($options['db_id_col']) ? $options['db_id_col'] : $this->idCol;
+ $this->dataCol = isset($options['db_data_col']) ? $options['db_data_col'] : $this->dataCol;
+ $this->lifetimeCol = isset($options['db_lifetime_col']) ? $options['db_lifetime_col'] : $this->lifetimeCol;
+ $this->timeCol = isset($options['db_time_col']) ? $options['db_time_col'] : $this->timeCol;
+ $this->username = isset($options['db_username']) ? $options['db_username'] : $this->username;
+ $this->password = isset($options['db_password']) ? $options['db_password'] : $this->password;
+ $this->connectionOptions = isset($options['db_connection_options']) ? $options['db_connection_options'] : $this->connectionOptions;
+ $this->lockMode = isset($options['lock_mode']) ? $options['lock_mode'] : $this->lockMode;
+ }
+
+ /**
+ * Creates the table to store sessions which can be called once for setup.
+ *
+ * Session ID is saved in a column of maximum length 128 because that is enough even
+ * for a 512 bit configured session.hash_function like Whirlpool. Session data is
+ * saved in a BLOB. One could also use a shorter inlined varbinary column
+ * if one was sure the data fits into it.
+ *
+ * @throws \PDOException When the table already exists
+ * @throws \DomainException When an unsupported PDO driver is used
+ */
+ public function createTable()
+ {
+ // connect if we are not yet
+ $this->getConnection();
+
+ switch ($this->driver) {
+ case 'mysql':
+ // We use varbinary for the ID column because it prevents unwanted conversions:
+ // - character set conversions between server and client
+ // - trailing space removal
+ // - case-insensitivity
+ // - language processing like é == e
+ $sql = "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol MEDIUMINT NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8_bin, ENGINE = InnoDB";
+ break;
+ case 'sqlite':
+ $sql = "CREATE TABLE $this->table ($this->idCol TEXT NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
+ break;
+ case 'pgsql':
+ $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol BYTEA NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
+ break;
+ case 'oci':
+ $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR2(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
+ break;
+ case 'sqlsrv':
+ $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol VARBINARY(MAX) NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
+ break;
+ default:
+ throw new \DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
+ }
+
+ try {
+ $this->pdo->exec($sql);
+ } catch (\PDOException $e) {
+ $this->rollback();
+
+ throw $e;
}
- $this->pdo = $pdo;
- $dbOptions = array_merge(array(
- 'db_id_col' => 'sess_id',
- 'db_data_col' => 'sess_data',
- 'db_time_col' => 'sess_time',
- ), $dbOptions);
-
- $this->table = $dbOptions['db_table'];
- $this->idCol = $dbOptions['db_id_col'];
- $this->dataCol = $dbOptions['db_data_col'];
- $this->timeCol = $dbOptions['db_time_col'];
}
/**
- * {@inheritdoc}
+ * Returns true when the current session exists but expired according to session.gc_maxlifetime.
+ *
+ * Can be used to distinguish between a new session and one that expired due to inactivity.
+ *
+ * @return bool Whether current session expired
*/
- public function open($savePath, $sessionName)
+ public function isSessionExpired()
{
- return true;
+ return $this->sessionExpired;
}
/**
* {@inheritdoc}
*/
- public function close()
+ public function open($savePath, $sessionName)
{
+ if (null === $this->pdo) {
+ $this->connect($this->dsn ?: $savePath);
+ }
+
return true;
}
/**
* {@inheritdoc}
*/
- public function destroy($sessionId)
+ public function read($sessionId)
{
- // delete the record associated with this id
- $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
-
try {
- $stmt = $this->pdo->prepare($sql);
- $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
- $stmt->execute();
+ return $this->doRead($sessionId);
} catch (\PDOException $e) {
- throw new \RuntimeException(sprintf('PDOException was thrown when trying to delete a session: %s', $e->getMessage()), 0, $e);
- }
+ $this->rollback();
- return true;
+ throw $e;
+ }
}
/**
@@ -126,16 +288,9 @@ public function destroy($sessionId)
*/
public function gc($maxlifetime)
{
- // delete the session records that have expired
- $sql = "DELETE FROM $this->table WHERE $this->timeCol < :time";
-
- try {
- $stmt = $this->pdo->prepare($sql);
- $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT);
- $stmt->execute();
- } catch (\PDOException $e) {
- throw new \RuntimeException(sprintf('PDOException was thrown when trying to delete expired sessions: %s', $e->getMessage()), 0, $e);
- }
+ // We delay gc() to close() so that it is executed outside the transactional and blocking read-write process.
+ // This way, pruning expired sessions does not block them from being started while the current session is used.
+ $this->gcCalled = true;
return true;
}
@@ -143,26 +298,22 @@ public function gc($maxlifetime)
/**
* {@inheritdoc}
*/
- public function read($sessionId)
+ public function destroy($sessionId)
{
- $sql = "SELECT $this->dataCol FROM $this->table WHERE $this->idCol = :id";
+ // delete the record associated with this id
+ $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
try {
$stmt = $this->pdo->prepare($sql);
$stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
$stmt->execute();
-
- // We use fetchAll instead of fetchColumn to make sure the DB cursor gets closed
- $sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
-
- if ($sessionRows) {
- return base64_decode($sessionRows[0][0]);
- }
-
- return '';
} catch (\PDOException $e) {
- throw new \RuntimeException(sprintf('PDOException was thrown when trying to read the session data: %s', $e->getMessage()), 0, $e);
+ $this->rollback();
+
+ throw $e;
}
+
+ return true;
}
/**
@@ -170,7 +321,7 @@ public function read($sessionId)
*/
public function write($sessionId, $data)
{
- $encoded = base64_encode($data);
+ $maxlifetime = (int) ini_get('session.gc_maxlifetime');
try {
// We use a single MERGE SQL query when supported by the database.
@@ -179,7 +330,8 @@ public function write($sessionId, $data)
if (null !== $mergeSql) {
$mergeStmt = $this->pdo->prepare($mergeSql);
$mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
- $mergeStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
+ $mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
+ $mergeStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
$mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
$mergeStmt->execute();
@@ -187,25 +339,27 @@ public function write($sessionId, $data)
}
$updateStmt = $this->pdo->prepare(
- "UPDATE $this->table SET $this->dataCol = :data, $this->timeCol = :time WHERE $this->idCol = :id"
+ "UPDATE $this->table SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time WHERE $this->idCol = :id"
);
$updateStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
- $updateStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
+ $updateStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
+ $updateStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
$updateStmt->bindValue(':time', time(), \PDO::PARAM_INT);
$updateStmt->execute();
// When MERGE is not supported, like in Postgres, we have to use this approach that can result in
- // duplicate key errors when the same session is written simultaneously. We can just catch such an
- // error and re-execute the update. This is similar to a serializable transaction with retry logic
- // on serialization failures but without the overhead and without possible false positives due to
- // longer gap locking.
+ // duplicate key errors when the same session is written simultaneously (given the LOCK_NONE behavior).
+ // We can just catch such an error and re-execute the update. This is similar to a serializable
+ // transaction with retry logic on serialization failures but without the overhead and without possible
+ // false positives due to longer gap locking.
if (!$updateStmt->rowCount()) {
try {
$insertStmt = $this->pdo->prepare(
- "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)"
+ "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)"
);
$insertStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
- $insertStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
+ $insertStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
+ $insertStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
$insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
$insertStmt->execute();
} catch (\PDOException $e) {
@@ -218,38 +372,310 @@ public function write($sessionId, $data)
}
}
} catch (\PDOException $e) {
- throw new \RuntimeException(sprintf('PDOException was thrown when trying to write the session data: %s', $e->getMessage()), 0, $e);
+ $this->rollback();
+
+ throw $e;
}
return true;
}
/**
- * Returns a merge/upsert (i.e. insert or update) SQL query when supported by the database.
+ * {@inheritdoc}
+ */
+ public function close()
+ {
+ $this->commit();
+
+ while ($unlockStmt = array_shift($this->unlockStatements)) {
+ $unlockStmt->execute();
+ }
+
+ if ($this->gcCalled) {
+ $this->gcCalled = false;
+
+ // delete the session records that have expired
+ $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol < :time";
+
+ $stmt = $this->pdo->prepare($sql);
+ $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
+ $stmt->execute();
+ }
+
+ if (false !== $this->dsn) {
+ $this->pdo = null; // only close lazy-connection
+ }
+
+ return true;
+ }
+
+ /**
+ * Lazy-connects to the database.
+ *
+ * @param string $dsn DSN string
+ */
+ private function connect($dsn)
+ {
+ $this->pdo = new \PDO($dsn, $this->username, $this->password, $this->connectionOptions);
+ $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+ $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+ }
+
+ /**
+ * Helper method to begin a transaction.
+ *
+ * Since SQLite does not support row level locks, we have to acquire a reserved lock
+ * on the database immediately. Because of https://bugs.php.net/42766 we have to create
+ * such a transaction manually which also means we cannot use PDO::commit or
+ * PDO::rollback or PDO::inTransaction for SQLite.
+ *
+ * Also MySQLs default isolation, REPEATABLE READ, causes deadlock for different sessions
+ * due to http://www.mysqlperformanceblog.com/2013/12/12/one-more-innodb-gap-lock-to-avoid/ .
+ * So we change it to READ COMMITTED.
+ */
+ private function beginTransaction()
+ {
+ if (!$this->inTransaction) {
+ if ('sqlite' === $this->driver) {
+ $this->pdo->exec('BEGIN IMMEDIATE TRANSACTION');
+ } else {
+ if ('mysql' === $this->driver) {
+ $this->pdo->exec('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+ }
+ $this->pdo->beginTransaction();
+ }
+ $this->inTransaction = true;
+ }
+ }
+
+ /**
+ * Helper method to commit a transaction.
+ */
+ private function commit()
+ {
+ if ($this->inTransaction) {
+ try {
+ // commit read-write transaction which also releases the lock
+ if ('sqlite' === $this->driver) {
+ $this->pdo->exec('COMMIT');
+ } else {
+ $this->pdo->commit();
+ }
+ $this->inTransaction = false;
+ } catch (\PDOException $e) {
+ $this->rollback();
+
+ throw $e;
+ }
+ }
+ }
+
+ /**
+ * Helper method to rollback a transaction.
+ */
+ private function rollback()
+ {
+ // We only need to rollback if we are in a transaction. Otherwise the resulting
+ // error would hide the real problem why rollback was called. We might not be
+ // in a transaction when not using the transactional locking behavior or when
+ // two callbacks (e.g. destroy and write) are invoked that both fail.
+ if ($this->inTransaction) {
+ if ('sqlite' === $this->driver) {
+ $this->pdo->exec('ROLLBACK');
+ } else {
+ $this->pdo->rollback();
+ }
+ $this->inTransaction = false;
+ }
+ }
+
+ /**
+ * Reads the session data in respect to the different locking strategies.
+ *
+ * We need to make sure we do not return session data that is already considered garbage according
+ * to the session.gc_maxlifetime setting because gc() is called after read() and only sometimes.
+ *
+ * @param string $sessionId Session ID
+ *
+ * @return string The session data
+ */
+ private function doRead($sessionId)
+ {
+ $this->sessionExpired = false;
+
+ if (self::LOCK_ADVISORY === $this->lockMode) {
+ $this->unlockStatements[] = $this->doAdvisoryLock($sessionId);
+ }
+
+ $selectSql = $this->getSelectSql();
+ $selectStmt = $this->pdo->prepare($selectSql);
+ $selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
+ $selectStmt->execute();
+
+ $sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);
+
+ if ($sessionRows) {
+ if ($sessionRows[0][1] + $sessionRows[0][2] < time()) {
+ $this->sessionExpired = true;
+
+ return '';
+ }
+
+ return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
+ }
+
+ if (self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
+ // Exclusive-reading of non-existent rows does not block, so we need to do an insert to block
+ // until other connections to the session are committed.
+ try {
+ $insertStmt = $this->pdo->prepare(
+ "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)"
+ );
+ $insertStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
+ $insertStmt->bindValue(':data', '', \PDO::PARAM_LOB);
+ $insertStmt->bindValue(':lifetime', 0, \PDO::PARAM_INT);
+ $insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
+ $insertStmt->execute();
+ } catch (\PDOException $e) {
+ // Catch duplicate key error because other connection created the session already.
+ // It would only not be the case when the other connection destroyed the session.
+ if (0 === strpos($e->getCode(), '23')) {
+ // Retrieve finished session data written by concurrent connection. SELECT
+ // FOR UPDATE is necessary to avoid deadlock of connection that starts reading
+ // before we write (transform intention to real lock).
+ $selectStmt->execute();
+ $sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);
+
+ if ($sessionRows) {
+ return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
+ }
+
+ return '';
+ }
+
+ throw $e;
+ }
+ }
+
+ return '';
+ }
+
+ /**
+ * Executes an application-level lock on the database.
+ *
+ * @param string $sessionId Session ID
+ *
+ * @return \PDOStatement The statement that needs to be executed later to release the lock
+ *
+ * @throws \DomainException When an unsupported PDO driver is used
+ *
+ * @todo implement missing advisory locks
+ * - for oci using DBMS_LOCK.REQUEST
+ * - for sqlsrv using sp_getapplock with LockOwner = Session
+ */
+ private function doAdvisoryLock($sessionId)
+ {
+ switch ($this->driver) {
+ case 'mysql':
+ // should we handle the return value? 0 on timeout, null on error
+ // we use a timeout of 50 seconds which is also the default for innodb_lock_wait_timeout
+ $stmt = $this->pdo->prepare('SELECT GET_LOCK(:key, 50)');
+ $stmt->bindValue(':key', $sessionId, \PDO::PARAM_STR);
+ $stmt->execute();
+
+ $releaseStmt = $this->pdo->prepare('DO RELEASE_LOCK(:key)');
+ $releaseStmt->bindValue(':key', $sessionId, \PDO::PARAM_STR);
+
+ return $releaseStmt;
+ case 'pgsql':
+ // Obtaining an exclusive session level advisory lock requires an integer key.
+ // So we convert the HEX representation of the session id to an integer.
+ // Since integers are signed, we have to skip one hex char to fit in the range.
+ if (4 === PHP_INT_SIZE) {
+ $sessionInt1 = hexdec(substr($sessionId, 0, 7));
+ $sessionInt2 = hexdec(substr($sessionId, 7, 7));
+
+ $stmt = $this->pdo->prepare('SELECT pg_advisory_lock(:key1, :key2)');
+ $stmt->bindValue(':key1', $sessionInt1, \PDO::PARAM_INT);
+ $stmt->bindValue(':key2', $sessionInt2, \PDO::PARAM_INT);
+ $stmt->execute();
+
+ $releaseStmt = $this->pdo->prepare('SELECT pg_advisory_unlock(:key1, :key2)');
+ $releaseStmt->bindValue(':key1', $sessionInt1, \PDO::PARAM_INT);
+ $releaseStmt->bindValue(':key2', $sessionInt2, \PDO::PARAM_INT);
+ } else {
+ $sessionBigInt = hexdec(substr($sessionId, 0, 15));
+
+ $stmt = $this->pdo->prepare('SELECT pg_advisory_lock(:key)');
+ $stmt->bindValue(':key', $sessionBigInt, \PDO::PARAM_INT);
+ $stmt->execute();
+
+ $releaseStmt = $this->pdo->prepare('SELECT pg_advisory_unlock(:key)');
+ $releaseStmt->bindValue(':key', $sessionBigInt, \PDO::PARAM_INT);
+ }
+
+ return $releaseStmt;
+ case 'sqlite':
+ throw new \DomainException('SQLite does not support advisory locks.');
+ default:
+ throw new \DomainException(sprintf('Advisory locks are currently not implemented for PDO driver "%s".', $this->driver));
+ }
+ }
+
+ /**
+ * Return a locking or nonlocking SQL query to read session information.
+ *
+ * @return string The SQL string
+ *
+ * @throws \DomainException When an unsupported PDO driver is used
+ */
+ private function getSelectSql()
+ {
+ if (self::LOCK_TRANSACTIONAL === $this->lockMode) {
+ $this->beginTransaction();
+
+ switch ($this->driver) {
+ case 'mysql':
+ case 'oci':
+ case 'pgsql':
+ return "SELECT $this->dataCol, $this->lifetimeCol, $this->timeCol FROM $this->table WHERE $this->idCol = :id FOR UPDATE";
+ case 'sqlsrv':
+ return "SELECT $this->dataCol, $this->lifetimeCol, $this->timeCol FROM $this->table WITH (UPDLOCK, ROWLOCK) WHERE $this->idCol = :id";
+ case 'sqlite':
+ // we already locked when starting transaction
+ break;
+ default:
+ throw new \DomainException(sprintf('Transactional locks are currently not implemented for PDO driver "%s".', $this->driver));
+ }
+ }
+
+ return "SELECT $this->dataCol, $this->lifetimeCol, $this->timeCol FROM $this->table WHERE $this->idCol = :id";
+ }
+
+ /**
+ * Returns a merge/upsert (i.e. insert or update) SQL query when supported by the database for writing session data.
*
* @return string|null The SQL string or null when not supported
*/
private function getMergeSql()
{
- $driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-
- switch ($driver) {
+ switch ($this->driver) {
case 'mysql':
- return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
- "ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->timeCol = VALUES($this->timeCol)";
+ return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
+ "ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->lifetimeCol = VALUES($this->lifetimeCol), $this->timeCol = VALUES($this->timeCol)";
case 'oci':
// DUAL is Oracle specific dummy table
return "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) ".
- "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
- "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time";
- case 'sqlsrv' === $driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
+ "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
+ "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time";
+ case 'sqlsrv' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
// MERGE is only available since SQL Server 2008 and must be terminated by semicolon
// It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
return "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = :id) ".
- "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
- "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time;";
+ "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
+ "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time;";
case 'sqlite':
- return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
+ return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
}
}
@@ -260,6 +686,10 @@ private function getMergeSql()
*/
protected function getConnection()
{
+ if (null === $this->pdo) {
+ $this->connect($this->dsn ?: ini_get('session.save_path'));
+ }
+
return $this->pdo;
}
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 31bf55c72dd993e829b8d1211a4693e9cc3dced8..f15ced587dc07596d0ce94e13c2234b07d719985 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -206,23 +206,7 @@ public function regenerate($destroy = false, $lifetime = null)
$this->metadataBag->stampNew();
}
- $ret = session_regenerate_id($destroy);
-
- // workaround for https://bugs.php.net/bug.php?id=61470 as suggested by David Grudl
- if ('files' === $this->getSaveHandler()->getSaveHandlerName()) {
- session_write_close();
- if (isset($_SESSION)) {
- $backup = $_SESSION;
- session_start();
- $_SESSION = $backup;
- } else {
- session_start();
- }
-
- $this->loadSession();
- }
-
- return $ret;
+ return session_regenerate_id($destroy);
}
/**
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
index 0fb2e2abc84649b942af9a5f7ab240cda3d7b223..9c93be0fad76e7a917460ef3f5801a8863fb7c89 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
@@ -88,6 +88,14 @@ public function setName($name);
* Note regenerate+destroy should not clear the session data in memory
* only delete the session data from persistent storage.
*
+ * Care: When regenerating the session ID no locking is involved in PHPs
+ * session design. See https://bugs.php.net/bug.php?id=61470 for a discussion.
+ * So you must make sure the regenerated session is saved BEFORE sending the
+ * headers with the new ID. Symfonys HttpKernel offers a listener for this.
+ * See Symfony\Component\HttpKernel\EventListener\SaveSessionListener.
+ * Otherwise session data could get lost again for concurrent requests with the
+ * new ID. One result could be that you get logged out after just logging in.
+ *
* @param bool $destroy Destroy session when regenerating?
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
* will leave the system settings unchanged, 0 sets the cookie
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/StreamedResponse.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/StreamedResponse.php
index 4be9f48c9cf939d3840a2711b447c490a93447bc..38986e8aa7f84bd2f550a65e98e4c4cfa762a176 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -79,16 +79,6 @@ public function setCallback($callback)
$this->callback = $callback;
}
- /**
- * {@inheritdoc}
- */
- public function prepare(Request $request)
- {
- $this->headers->set('Cache-Control', 'no-cache');
-
- return parent::prepare($request);
- }
-
/**
* {@inheritdoc}
*
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
index d9f9a323302a0be67ebdfe8ef42b9bec494a3932..6845118cc2e3ce636cf9a5b561789db518434f49 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
@@ -35,7 +35,7 @@ public function provideServerVars()
array(
'REQUEST_URI' => '/foo/app_dev.php/bar',
'SCRIPT_NAME' => '/foo/app_dev.php',
- 'PATH_INFO' => '/bar',
+ 'PATH_INFO' => '/bar',
),
'/foo/app_dev.php/bar',
'/foo/app_dev.php',
@@ -54,7 +54,7 @@ public function provideServerVars()
array(
'REQUEST_URI' => '/app_dev.php/foo/bar',
'SCRIPT_NAME' => '/app_dev.php',
- 'PATH_INFO' => '/foo/bar',
+ 'PATH_INFO' => '/foo/bar',
),
'/app_dev.php/foo/bar',
'/app_dev.php',
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
index cfb474dda1699ac5ae896b1dcb9158a25b97037a..da8ad77b220d6b1c82f16ed122f8122a5cafc644 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
@@ -193,14 +193,22 @@ public function testXAccelMapping($realpath, $mapping, $virtual)
$this->assertEquals($virtual, $response->headers->get('X-Accel-Redirect'));
}
- public function testSplFileObject()
+ public function testDeleteFileAfterSend()
{
- $filePath = __DIR__.'/File/Fixtures/test';
- $file = new \SplFileObject($filePath);
+ $request = Request::create('/');
- $response = new BinaryFileResponse($file);
+ $path = __DIR__.'/File/Fixtures/to_delete';
+ touch($path);
+ $realPath = realpath($path);
+ $this->assertFileExists($realPath);
+
+ $response = new BinaryFileResponse($realPath);
+ $response->deleteFileAfterSend(true);
- $this->assertEquals(realpath($response->getFile()->getPathname()), realpath($filePath));
+ $response->prepare($request);
+ $response->sendContent();
+
+ $this->assertFileNotExists($path);
}
public function getSampleXAccelMappings()
@@ -215,4 +223,12 @@ protected function provideResponse()
{
return new BinaryFileResponse(__DIR__.'/../README.md');
}
+
+ public static function tearDownAfterClass()
+ {
+ $path = __DIR__.'/../Fixtures/to_delete';
+ if (file_exists($path)) {
+ @unlink($path);
+ }
+ }
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
index b1bfefbf87b76c56a1482d7fbec4270427d754f1..f1a0ef2c9b7ea6541867436fe72a4e2f37d27af2 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
@@ -191,7 +191,7 @@ public function testCacheControlDirectiveOverrideWithReplace()
*/
public function testGetIterator()
{
- $headers = array('foo' => 'bar', 'hello' => 'world', 'third' => 'charm');
+ $headers = array('foo' => 'bar', 'hello' => 'world', 'third' => 'charm');
$headerBag = new HeaderBag($headers);
$i = 0;
@@ -208,7 +208,7 @@ public function testGetIterator()
*/
public function testCount()
{
- $headers = array('foo' => 'bar', 'HELLO' => 'WORLD');
+ $headers = array('foo' => 'bar', 'HELLO' => 'WORLD');
$headerBag = new HeaderBag($headers);
$this->assertEquals(count($headers), count($headerBag));
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
index 95af8a14d930ae714999d69bda26798d6cfce851..8ef34ce98fd790ffe0da78f28b0188f0d70747f4 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -211,12 +211,12 @@ public function testFilter()
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as URL with a path');
$this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
- 'flags' => FILTER_FLAG_ALLOW_HEX,
+ 'flags' => FILTER_FLAG_ALLOW_HEX,
'options' => array('min_range' => 1, 'max_range' => 0xff),)
), '->filter() gets a value of parameter as integer between boundaries');
$this->assertFalse($bag->filter('hex', '', false, FILTER_VALIDATE_INT, array(
- 'flags' => FILTER_FLAG_ALLOW_HEX,
+ 'flags' => FILTER_FLAG_ALLOW_HEX,
'options' => array('min_range' => 1, 'max_range' => 0xff),)
), '->filter() gets a value of parameter as integer between boundaries');
@@ -250,4 +250,17 @@ public function testCount()
$this->assertEquals(count($parameters), count($bag));
}
+
+ /**
+ * @covers Symfony\Component\HttpFoundation\ParameterBag::getBoolean
+ */
+ public function testGetBoolean()
+ {
+ $parameters = array('string_true' => 'true', 'string_false' => 'false');
+ $bag = new ParameterBag($parameters);
+
+ $this->assertTrue($bag->getBoolean('string_true'), '->getBoolean() gets the string true as boolean true');
+ $this->assertFalse($bag->getBoolean('string_false'), '->getBoolean() gets the string false as boolean false');
+ $this->assertFalse($bag->getBoolean('unknown'), '->getBoolean() returns false if a parameter is not defined');
+ }
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
index 63d37492ec1264b94c7c405d2089a0c0b36fedfb..cee9bcc26144c133f8b5962b4830d787d9047b71 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
@@ -43,6 +43,25 @@ public function testMethodFixtures()
);
}
+ public function testScheme()
+ {
+ $httpRequest = $request = $request = Request::create('');
+ $httpsRequest = $request = $request = Request::create('', 'get', array(), array(), array(), array('HTTPS' => 'on'));
+
+ $matcher = new RequestMatcher();
+ $matcher->matchScheme('https');
+ $this->assertFalse($matcher->matches($httpRequest));
+ $this->assertTrue($matcher->matches($httpsRequest));
+
+ $matcher->matchScheme('http');
+ $this->assertFalse($matcher->matches($httpsRequest));
+ $this->assertTrue($matcher->matches($httpRequest));
+
+ $matcher = new RequestMatcher();
+ $this->assertTrue($matcher->matches($httpsRequest));
+ $this->assertTrue($matcher->matches($httpRequest));
+ }
+
/**
* @dataProvider testHostFixture
*/
@@ -68,7 +87,8 @@ public function testHostFixture()
array('.*\.example\.COM', true),
array('\.example\.COM$', true),
array('^.*\.example\.COM$', true),
- array('.*\.sensio\.COM', false), );
+ array('.*\.sensio\.COM', false),
+ );
}
public function testPath()
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index c07557b85c743dcb18cfb5d823f8ccde0cd5d009..263fd9bd96dfa86384d02e6afb506d531f03693a 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -232,13 +232,13 @@ public function testCreateCheckPrecedence()
{
// server is used by default
$request = Request::create('/', 'DELETE', array(), array(), array(), array(
- 'HTTP_HOST' => 'example.com',
- 'HTTPS' => 'on',
- 'SERVER_PORT' => 443,
+ 'HTTP_HOST' => 'example.com',
+ 'HTTPS' => 'on',
+ 'SERVER_PORT' => 443,
'PHP_AUTH_USER' => 'fabien',
- 'PHP_AUTH_PW' => 'pa$$',
- 'QUERY_STRING' => 'foo=bar',
- 'CONTENT_TYPE' => 'application/json',
+ 'PHP_AUTH_PW' => 'pa$$',
+ 'QUERY_STRING' => 'foo=bar',
+ 'CONTENT_TYPE' => 'application/json',
));
$this->assertEquals('example.com', $request->getHost());
$this->assertEquals(443, $request->getPort());
@@ -250,8 +250,8 @@ public function testCreateCheckPrecedence()
// URI has precedence over server
$request = Request::create('http://thomas:pokemon@example.net:8080/?foo=bar', 'GET', array(), array(), array(), array(
- 'HTTP_HOST' => 'example.com',
- 'HTTPS' => 'on',
+ 'HTTP_HOST' => 'example.com',
+ 'HTTPS' => 'on',
'SERVER_PORT' => 443,
));
$this->assertEquals('example.net', $request->getHost());
@@ -436,14 +436,14 @@ public function testGetUri()
// With encoded characters
$server = array(
- 'HTTP_HOST' => 'host:8080',
- 'SERVER_NAME' => 'servername',
- 'SERVER_PORT' => '8080',
- 'QUERY_STRING' => 'query=string',
- 'REQUEST_URI' => '/ba%20se/index_dev.php/foo%20bar/in+fo?query=string',
- 'SCRIPT_NAME' => '/ba se/index_dev.php',
+ 'HTTP_HOST' => 'host:8080',
+ 'SERVER_NAME' => 'servername',
+ 'SERVER_PORT' => '8080',
+ 'QUERY_STRING' => 'query=string',
+ 'REQUEST_URI' => '/ba%20se/index_dev.php/foo%20bar/in+fo?query=string',
+ 'SCRIPT_NAME' => '/ba se/index_dev.php',
'PATH_TRANSLATED' => 'redirect:/index.php/foo bar/in+fo',
- 'PHP_SELF' => '/ba se/index_dev.php/path/info',
+ 'PHP_SELF' => '/ba se/index_dev.php/path/info',
'SCRIPT_FILENAME' => '/some/where/ba se/index_dev.php',
);
@@ -706,7 +706,7 @@ public function testGetPort()
Request::setTrustedProxies(array('1.1.1.1'));
$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
'HTTP_X_FORWARDED_PROTO' => 'https',
- 'HTTP_X_FORWARDED_PORT' => '8443',
+ 'HTTP_X_FORWARDED_PORT' => '8443',
));
$port = $request->getPort();
@@ -944,10 +944,10 @@ public function testCreateFromGlobals($method)
{
$normalizedMethod = strtoupper($method);
- $_GET['foo1'] = 'bar1';
- $_POST['foo2'] = 'bar2';
+ $_GET['foo1'] = 'bar1';
+ $_POST['foo2'] = 'bar2';
$_COOKIE['foo3'] = 'bar3';
- $_FILES['foo4'] = array('bar4');
+ $_FILES['foo4'] = array('bar4');
$_SERVER['foo5'] = 'bar5';
$request = Request::createFromGlobals();
@@ -969,8 +969,8 @@ public function testCreateFromGlobals($method)
Request::createFromGlobals();
Request::enableHttpMethodParameterOverride();
- $_POST['_method'] = $method;
- $_POST['foo6'] = 'bar6';
+ $_POST['_method'] = $method;
+ $_POST['foo6'] = 'bar6';
$_SERVER['REQUEST_METHOD'] = 'PoSt';
$request = Request::createFromGlobals();
$this->assertEquals($normalizedMethod, $request->getMethod());
@@ -1327,8 +1327,8 @@ public function getBaseUrlData()
'/foo%20bar',
array(
'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
- 'SCRIPT_NAME' => '/foo bar/app.php',
- 'PHP_SELF' => '/foo bar/app.php',
+ 'SCRIPT_NAME' => '/foo bar/app.php',
+ 'PHP_SELF' => '/foo bar/app.php',
),
'/foo%20bar',
'/',
@@ -1337,8 +1337,8 @@ public function getBaseUrlData()
'/foo%20bar/home',
array(
'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
- 'SCRIPT_NAME' => '/foo bar/app.php',
- 'PHP_SELF' => '/foo bar/app.php',
+ 'SCRIPT_NAME' => '/foo bar/app.php',
+ 'PHP_SELF' => '/foo bar/app.php',
),
'/foo%20bar',
'/home',
@@ -1347,8 +1347,8 @@ public function getBaseUrlData()
'/foo%20bar/app.php/home',
array(
'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
- 'SCRIPT_NAME' => '/foo bar/app.php',
- 'PHP_SELF' => '/foo bar/app.php',
+ 'SCRIPT_NAME' => '/foo bar/app.php',
+ 'PHP_SELF' => '/foo bar/app.php',
),
'/foo%20bar/app.php',
'/home',
@@ -1357,8 +1357,8 @@ public function getBaseUrlData()
'/foo%20bar/app.php/home%3Dbaz',
array(
'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
- 'SCRIPT_NAME' => '/foo bar/app.php',
- 'PHP_SELF' => '/foo bar/app.php',
+ 'SCRIPT_NAME' => '/foo bar/app.php',
+ 'PHP_SELF' => '/foo bar/app.php',
),
'/foo%20bar/app.php',
'/home%3Dbaz',
@@ -1367,8 +1367,8 @@ public function getBaseUrlData()
'/foo/bar+baz',
array(
'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo/app.php',
- 'SCRIPT_NAME' => '/foo/app.php',
- 'PHP_SELF' => '/foo/app.php',
+ 'SCRIPT_NAME' => '/foo/app.php',
+ 'PHP_SELF' => '/foo/app.php',
),
'/foo',
'/bar+baz',
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
index 1201deb9030ab469b39c750a2e23f0d0660fe635..ad291f9c378d861394953e52e3fa0b32e29b0c6a 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -121,6 +121,15 @@ public function testToStringIncludesCookieHeaders()
$this->assertContains("Set-Cookie: foo=deleted; expires=".gmdate("D, d-M-Y H:i:s T", time() - 31536001)."; path=/; httponly", explode("\r\n", $bag->__toString()));
}
+ public function testClearCookieSecureNotHttpOnly()
+ {
+ $bag = new ResponseHeaderBag(array());
+
+ $bag->clearCookie('foo', '/', null, true, false);
+
+ $this->assertContains("Set-Cookie: foo=deleted; expires=".gmdate("D, d-M-Y H:i:s T", time() - 31536001)."; path=/; secure", explode("\r\n", $bag->__toString()));
+ }
+
public function testReplace()
{
$bag = new ResponseHeaderBag(array());
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index 5b7de70bd8346481464db84578fdc1a121cbdfdc..761526f816ae9db729860845e758abd0b59e0629 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -141,9 +141,9 @@ public function testIsNotModifiedNotSafe()
public function testIsNotModifiedLastModified()
{
- $before = 'Sun, 25 Aug 2013 18:32:31 GMT';
+ $before = 'Sun, 25 Aug 2013 18:32:31 GMT';
$modified = 'Sun, 25 Aug 2013 18:33:31 GMT';
- $after = 'Sun, 25 Aug 2013 19:33:31 GMT';
+ $after = 'Sun, 25 Aug 2013 19:33:31 GMT';
$request = new Request();
$request->headers->set('If-Modified-Since', $modified);
@@ -185,10 +185,10 @@ public function testIsNotModifiedEtag()
public function testIsNotModifiedLastModifiedAndEtag()
{
- $before = 'Sun, 25 Aug 2013 18:32:31 GMT';
+ $before = 'Sun, 25 Aug 2013 18:32:31 GMT';
$modified = 'Sun, 25 Aug 2013 18:33:31 GMT';
- $after = 'Sun, 25 Aug 2013 19:33:31 GMT';
- $etag = 'randomly_generated_etag';
+ $after = 'Sun, 25 Aug 2013 19:33:31 GMT';
+ $etag = 'randomly_generated_etag';
$request = new Request();
$request->headers->set('if_none_match', sprintf('%s, %s', $etag, 'etagThree'));
@@ -212,7 +212,7 @@ public function testIsNotModifiedLastModifiedAndEtag()
public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
{
$modified = 'Sun, 25 Aug 2013 18:33:31 GMT';
- $etag = 'randomly_generated_etag';
+ $etag = 'randomly_generated_etag';
$request = new Request();
$request->headers->set('if_none_match', sprintf('%s, %s', $etag, 'etagThree'));
@@ -825,18 +825,18 @@ public function testSettersAreChainable()
public function validContentProvider()
{
return array(
- 'obj' => array(new StringableObject()),
+ 'obj' => array(new StringableObject()),
'string' => array('Foo'),
- 'int' => array(2),
+ 'int' => array(2),
);
}
public function invalidContentProvider()
{
return array(
- 'obj' => array(new \stdClass()),
+ 'obj' => array(new \stdClass()),
'array' => array(array()),
- 'bool' => array(true, '1'),
+ 'bool' => array(true, '1'),
);
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
index 72be3272526f6ebfed93d01abf720fad45151c09..a7e590871a5b483170a56aa48480f0ea096e80d4 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -31,6 +31,10 @@ protected function setUp()
$this->markTestSkipped('Skipped tests Memcached class is not present');
}
+ if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {
+ $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');
+ }
+
$this->memcached = $this->getMock('Memcached');
$this->storage = new MemcachedSessionHandler(
$this->memcached,
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 9be6352b3100152589fd86f0bc49ee144edd5647..ac8947025c2ad8f857c427782d1428f314a7b4c0 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -37,7 +37,7 @@ protected function setUp()
->getMock();
$this->options = array(
- 'id_field' => '_id',
+ 'id_field' => '_id',
'data_field' => 'data',
'time_field' => 'time',
'database' => 'sf2-test',
@@ -100,6 +100,45 @@ public function testWrite()
$that->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
}
+ public function testWriteWhenUsingExpiresField()
+ {
+ $this->options = array(
+ 'id_field' => '_id',
+ 'data_field' => 'data',
+ 'time_field' => 'time',
+ 'database' => 'sf2-test',
+ 'collection' => 'session-test',
+ 'expiry_field' => 'expiresAt',
+ );
+
+ $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
+
+ $collection = $this->createMongoCollectionMock();
+
+ $this->mongo->expects($this->once())
+ ->method('selectCollection')
+ ->with($this->options['database'], $this->options['collection'])
+ ->will($this->returnValue($collection));
+
+ $that = $this;
+ $data = array();
+
+ $collection->expects($this->once())
+ ->method('update')
+ ->will($this->returnCallback(function ($criteria, $updateData, $options) use ($that, &$data) {
+ $that->assertEquals(array($that->options['id_field'] => 'foo'), $criteria);
+ $that->assertEquals(array('upsert' => true, 'multiple' => false), $options);
+
+ $data = $updateData['$set'];
+ }));
+
+ $this->assertTrue($this->storage->write('foo', 'bar'));
+
+ $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
+ $that->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
+ $that->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
+ }
+
public function testReplaceSessionData()
{
$collection = $this->createMongoCollectionMock();
@@ -154,10 +193,36 @@ public function testGc()
->method('remove')
->will($this->returnCallback(function ($criteria) use ($that) {
$that->assertInstanceOf('MongoDate', $criteria[$that->options['time_field']]['$lt']);
- $that->assertGreaterThanOrEqual(time() - -1, $criteria[$that->options['time_field']]['$lt']->sec);
+ $that->assertGreaterThanOrEqual(time() - 1, $criteria[$that->options['time_field']]['$lt']->sec);
}));
- $this->assertTrue($this->storage->gc(-1));
+ $this->assertTrue($this->storage->gc(1));
+ }
+
+ public function testGcWhenUsingExpiresField()
+ {
+ $this->options = array(
+ 'id_field' => '_id',
+ 'data_field' => 'data',
+ 'time_field' => 'time',
+ 'database' => 'sf2-test',
+ 'collection' => 'session-test',
+ 'expiry_field' => 'expiresAt',
+ );
+
+ $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
+
+ $collection = $this->createMongoCollectionMock();
+
+ $this->mongo->expects($this->never())
+ ->method('selectCollection');
+
+ $that = $this;
+
+ $collection->expects($this->never())
+ ->method('remove');
+
+ $this->assertTrue($this->storage->gc(1));
}
public function testGetConnection()
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 1438102f84c25a4b984e37acef6fcc8c49bffef1..ba06fccff910365ef8539c89ccd746705fff7ed9 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -15,97 +15,345 @@
class PdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
{
- private $pdo;
+ private $dbFile;
protected function setUp()
{
if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
$this->markTestSkipped('This test requires SQLite support in your environment');
}
+ }
- $this->pdo = new \PDO('sqlite::memory:');
- $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
- $sql = 'CREATE TABLE sessions (sess_id VARCHAR(128) PRIMARY KEY, sess_data TEXT, sess_time INTEGER)';
- $this->pdo->exec($sql);
+ protected function tearDown()
+ {
+ // make sure the temporary database file is deleted when it has been created (even when a test fails)
+ if ($this->dbFile) {
+ @unlink($this->dbFile);
+ }
}
- public function testIncompleteOptions()
+ protected function getPersistentSqliteDsn()
{
- $this->setExpectedException('InvalidArgumentException');
- $storage = new PdoSessionHandler($this->pdo, array());
+ $this->dbFile = tempnam(sys_get_temp_dir(), 'sf2_sqlite_sessions');
+
+ return 'sqlite:'.$this->dbFile;
}
- public function testWrongPdoErrMode()
+ protected function getMemorySqlitePdo()
{
$pdo = new \PDO('sqlite::memory:');
+ $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+ $storage = new PdoSessionHandler($pdo);
+ $storage->createTable();
+
+ return $pdo;
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ */
+ public function testWrongPdoErrMode()
+ {
+ $pdo = $this->getMemorySqlitePdo();
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
- $pdo->exec('CREATE TABLE sessions (sess_id VARCHAR(128) PRIMARY KEY, sess_data TEXT, sess_time INTEGER)');
- $this->setExpectedException('InvalidArgumentException');
- $storage = new PdoSessionHandler($pdo, array('db_table' => 'sessions'));
+ $storage = new PdoSessionHandler($pdo);
+ }
+
+ /**
+ * @expectedException \RuntimeException
+ */
+ public function testInexistentTable()
+ {
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo(), array('db_table' => 'inexistent_table'));
+ $storage->open('', 'sid');
+ $storage->read('id');
+ $storage->write('id', 'data');
+ $storage->close();
+ }
+
+ /**
+ * @expectedException \RuntimeException
+ */
+ public function testCreateTableTwice()
+ {
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+ $storage->createTable();
+ }
+
+ public function testWithLazyDsnConnection()
+ {
+ $dsn = $this->getPersistentSqliteDsn();
+
+ $storage = new PdoSessionHandler($dsn);
+ $storage->createTable();
+ $storage->open('', 'sid');
+ $data = $storage->read('id');
+ $storage->write('id', 'data');
+ $storage->close();
+ $this->assertSame('', $data, 'New session returns empty string data');
+
+ $storage->open('', 'sid');
+ $data = $storage->read('id');
+ $storage->close();
+ $this->assertSame('data', $data, 'Written value can be read back correctly');
}
- public function testWrongTableOptionsWrite()
+ public function testWithLazySavePathConnection()
{
- $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'bad_name'));
- $this->setExpectedException('RuntimeException');
- $storage->write('foo', 'bar');
+ $dsn = $this->getPersistentSqliteDsn();
+
+ // Open is called with what ini_set('session.save_path', $dsn) would mean
+ $storage = new PdoSessionHandler(null);
+ $storage->open($dsn, 'sid');
+ $storage->createTable();
+ $data = $storage->read('id');
+ $storage->write('id', 'data');
+ $storage->close();
+ $this->assertSame('', $data, 'New session returns empty string data');
+
+ $storage->open($dsn, 'sid');
+ $data = $storage->read('id');
+ $storage->close();
+ $this->assertSame('data', $data, 'Written value can be read back correctly');
+ }
+
+ public function testReadWriteReadWithNullByte()
+ {
+ $sessionData = 'da'."\0".'ta';
+
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+ $storage->open('', 'sid');
+ $readData = $storage->read('id');
+ $storage->write('id', $sessionData);
+ $storage->close();
+ $this->assertSame('', $readData, 'New session returns empty string data');
+
+ $storage->open('', 'sid');
+ $readData = $storage->read('id');
+ $storage->close();
+ $this->assertSame($sessionData, $readData, 'Written value can be read back correctly');
+ }
+
+ public function testReadConvertsStreamToString()
+ {
+ $pdo = new MockPdo('pgsql');
+ $pdo->prepareResult = $this->getMock('PDOStatement');
+
+ $content = 'foobar';
+ $stream = $this->createStream($content);
+
+ $pdo->prepareResult->expects($this->once())->method('fetchAll')
+ ->will($this->returnValue(array(array($stream, 42, time()))));
+
+ $storage = new PdoSessionHandler($pdo);
+ $result = $storage->read('foo');
+
+ $this->assertSame($content, $result);
+ }
+
+ public function testReadLockedConvertsStreamToString()
+ {
+ $pdo = new MockPdo('pgsql');
+ $selectStmt = $this->getMock('PDOStatement');
+ $insertStmt = $this->getMock('PDOStatement');
+
+ $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
+ return 0 === strpos($statement, 'INSERT') ? $insertStmt : $selectStmt;
+ };
+
+ $content = 'foobar';
+ $stream = $this->createStream($content);
+ $exception = null;
+
+ $selectStmt->expects($this->atLeast(2))->method('fetchAll')
+ ->will($this->returnCallback(function () use (&$exception, $stream) {
+ return $exception ? array(array($stream, 42, time())) : array();
+ }));
+
+ $insertStmt->expects($this->once())->method('execute')
+ ->will($this->returnCallback(function () use (&$exception) {
+ throw $exception = new \PDOException('', '23');
+ }));
+
+ $storage = new PdoSessionHandler($pdo);
+ $result = $storage->read('foo');
+
+ $this->assertSame($content, $result);
}
- public function testWrongTableOptionsRead()
+ public function testReadingRequiresExactlySameId()
{
- $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'bad_name'));
- $this->setExpectedException('RuntimeException');
- $storage->read('foo', 'bar');
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+ $storage->open('', 'sid');
+ $storage->write('id', 'data');
+ $storage->write('test', 'data');
+ $storage->write('space ', 'data');
+ $storage->close();
+
+ $storage->open('', 'sid');
+ $readDataCaseSensitive = $storage->read('ID');
+ $readDataNoCharFolding = $storage->read('tést');
+ $readDataKeepSpace = $storage->read('space ');
+ $readDataExtraSpace = $storage->read('space ');
+ $storage->close();
+
+ $this->assertSame('', $readDataCaseSensitive, 'Retrieval by ID should be case-sensitive (collation setting)');
+ $this->assertSame('', $readDataNoCharFolding, 'Retrieval by ID should not do character folding (collation setting)');
+ $this->assertSame('data', $readDataKeepSpace, 'Retrieval by ID requires spaces as-is');
+ $this->assertSame('', $readDataExtraSpace, 'Retrieval by ID requires spaces as-is');
}
- public function testWriteRead()
+ /**
+ * Simulates session_regenerate_id(true) which will require an INSERT or UPDATE (replace)
+ */
+ public function testWriteDifferentSessionIdThanRead()
{
- $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
- $storage->write('foo', 'bar');
- $this->assertEquals('bar', $storage->read('foo'), 'written value can be read back correctly');
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+ $storage->open('', 'sid');
+ $storage->read('id');
+ $storage->destroy('id');
+ $storage->write('new_id', 'data_of_new_session_id');
+ $storage->close();
+
+ $storage->open('', 'sid');
+ $data = $storage->read('new_id');
+ $storage->close();
+
+ $this->assertSame('data_of_new_session_id', $data, 'Data of regenerated session id is available');
}
- public function testMultipleInstances()
+ public function testWrongUsageStillWorks()
{
- $storage1 = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
- $storage1->write('foo', 'bar');
+ // wrong method sequence that should no happen, but still works
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+ $storage->write('id', 'data');
+ $storage->write('other_id', 'other_data');
+ $storage->destroy('inexistent');
+ $storage->open('', 'sid');
+ $data = $storage->read('id');
+ $otherData = $storage->read('other_id');
+ $storage->close();
- $storage2 = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
- $this->assertEquals('bar', $storage2->read('foo'), 'values persist between instances');
+ $this->assertSame('data', $data);
+ $this->assertSame('other_data', $otherData);
}
public function testSessionDestroy()
{
- $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
- $storage->write('foo', 'bar');
- $this->assertCount(1, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
+ $pdo = $this->getMemorySqlitePdo();
+ $storage = new PdoSessionHandler($pdo);
+
+ $storage->open('', 'sid');
+ $storage->read('id');
+ $storage->write('id', 'data');
+ $storage->close();
+ $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
- $storage->destroy('foo');
+ $storage->open('', 'sid');
+ $storage->read('id');
+ $storage->destroy('id');
+ $storage->close();
+ $this->assertEquals(0, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
- $this->assertCount(0, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
+ $storage->open('', 'sid');
+ $data = $storage->read('id');
+ $storage->close();
+ $this->assertSame('', $data, 'Destroyed session returns empty string');
}
public function testSessionGC()
{
- $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
+ $previousLifeTime = ini_set('session.gc_maxlifetime', 1000);
+ $pdo = $this->getMemorySqlitePdo();
+ $storage = new PdoSessionHandler($pdo);
- $storage->write('foo', 'bar');
- $storage->write('baz', 'bar');
+ $storage->open('', 'sid');
+ $storage->read('id');
+ $storage->write('id', 'data');
+ $storage->close();
- $this->assertCount(2, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
+ $storage->open('', 'sid');
+ $storage->read('gc_id');
+ ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
+ $storage->write('gc_id', 'data');
+ $storage->close();
+ $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
+ $storage->open('', 'sid');
+ $data = $storage->read('gc_id');
$storage->gc(-1);
- $this->assertCount(0, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
+ $storage->close();
+
+ ini_set('session.gc_maxlifetime', $previousLifeTime);
+
+ $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
+ $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
}
public function testGetConnection()
{
- $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'), array());
+ $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
$method = new \ReflectionMethod($storage, 'getConnection');
$method->setAccessible(true);
$this->assertInstanceOf('\PDO', $method->invoke($storage));
}
+
+ public function testGetConnectionConnectsIfNeeded()
+ {
+ $storage = new PdoSessionHandler('sqlite::memory:');
+
+ $method = new \ReflectionMethod($storage, 'getConnection');
+ $method->setAccessible(true);
+
+ $this->assertInstanceOf('\PDO', $method->invoke($storage));
+ }
+
+ private function createStream($content)
+ {
+ $stream = tmpfile();
+ fwrite($stream, $content);
+ fseek($stream, 0);
+
+ return $stream;
+ }
+}
+
+class MockPdo extends \PDO
+{
+ public $prepareResult;
+ private $driverName;
+ private $errorMode;
+
+ public function __construct($driverName = null, $errorMode = null)
+ {
+ $this->driverName = $driverName;
+ $this->errorMode = null !== $errorMode ?: \PDO::ERRMODE_EXCEPTION;
+ }
+
+ public function getAttribute($attribute)
+ {
+ if (\PDO::ATTR_ERRMODE === $attribute) {
+ return $this->errorMode;
+ }
+
+ if (\PDO::ATTR_DRIVER_NAME === $attribute) {
+ return $this->driverName;
+ }
+
+ return parent::getAttribute($attribute);
+ }
+
+ public function prepare($statement, $driverOptions = array())
+ {
+ return is_callable($this->prepareResult)
+ ? call_user_func($this->prepareResult, $statement, $driverOptions)
+ : $this->prepareResult;
+ }
+
+ public function beginTransaction()
+ {
+ }
}
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
index 0dfe65160093c1134e0a9757acc64695c6f9d85a..940f17cac48ce15fd0417decf136289135307d8a 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
@@ -34,7 +34,6 @@ public function testPrepareWith11Protocol()
$this->assertEquals('1.1', $response->getProtocolVersion());
$this->assertNotEquals('chunked', $response->headers->get('Transfer-Encoding'), 'Apache assumes responses with a Transfer-Encoding header set to chunked to already be encoded.');
- $this->assertEquals('no-cache, private', $response->headers->get('Cache-Control'));
}
public function testPrepareWith10Protocol()
@@ -47,7 +46,6 @@ public function testPrepareWith10Protocol()
$this->assertEquals('1.0', $response->getProtocolVersion());
$this->assertNull($response->headers->get('Transfer-Encoding'));
- $this->assertEquals('no-cache, private', $response->headers->get('Cache-Control'));
}
public function testPrepareWithHeadRequest()
@@ -58,6 +56,15 @@ public function testPrepareWithHeadRequest()
$response->prepare($request);
}
+ public function testPrepareWithCacheHeaders()
+ {
+ $response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Cache-Control' => 'max-age=600, public'));
+ $request = Request::create('/', 'GET');
+
+ $response->prepare($request);
+ $this->assertEquals('max-age=600, public', $response->headers->get('Cache-Control'));
+ }
+
public function testSendContent()
{
$called = 0;
diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/composer.json b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/composer.json
index db57eb563ebfcecb18445cc1fe5023ab87db6089..25294adb79445a6c2de78602f08cd09395513e8b 100644
--- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/composer.json
+++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/composer.json
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Bundle/Bundle.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Bundle/Bundle.php
index f80fd4a91c3404b58c733fed48601ee82ecf7d4a..93048c408b0d13197427a768068d3b37364916f3 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Bundle/Bundle.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -72,19 +72,16 @@ public function build(ContainerBuilder $container)
public function getContainerExtension()
{
if (null === $this->extension) {
- $basename = preg_replace('/Bundle$/', '', $this->getName());
-
- $class = $this->getNamespace().'\\DependencyInjection\\'.$basename.'Extension';
+ $class = $this->getContainerExtensionClass();
if (class_exists($class)) {
$extension = new $class();
// check naming convention
+ $basename = preg_replace('/Bundle$/', '', $this->getName());
$expectedAlias = Container::underscore($basename);
if ($expectedAlias != $extension->getAlias()) {
throw new \LogicException(sprintf(
- 'The extension alias for the default extension of a '.
- 'bundle must be the underscored version of the '.
- 'bundle name ("%s" instead of "%s")',
+ 'Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.',
$expectedAlias, $extension->getAlias()
));
}
@@ -199,4 +196,16 @@ public function registerCommands(Application $application)
}
}
}
+
+ /**
+ * Returns the bundle's container extension class.
+ *
+ * @return string
+ */
+ protected function getContainerExtensionClass()
+ {
+ $basename = preg_replace('/Bundle$/', '', $this->getName());
+
+ return $this->getNamespace().'\\DependencyInjection\\'.$basename.'Extension';
+ }
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md
index 2b2e827d979ea50fd45e4c501d2a4ce9e0d57dee..ed7f6035ace95253c5d6ffa8e35151713c9bb594 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -1,6 +1,12 @@
CHANGELOG
=========
+2.6.0
+-----
+
+ * deprecated `Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener`, use `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` instead
+ * deprecated unused method `Symfony\Component\HttpKernel\Kernel::isClassInActiveBundle` and `Symfony\Component\HttpKernel\KernelInterface::isClassInActiveBundle`
+
2.5.0
-----
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Config/FileLocator.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Config/FileLocator.php
index 47b543c15eeb99488f5df33a310e249ea71a2230..169c9ad6e502a1b06c5a2312f1998f4d4f68f500 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Config/FileLocator.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -47,7 +47,7 @@ public function __construct(KernelInterface $kernel, $path = null, array $paths
*/
public function locate($file, $currentPath = null, $first = true)
{
- if ('@' === $file[0]) {
+ if (isset($file[0]) && '@' === $file[0]) {
return $this->kernel->locateResource($file, $this->path, $first);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index 563ee8ffd93ad89b94887132b2eb7a9de3040216..b9bac023bd0d0cd755bde714acaf0993363cf956 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -71,7 +71,7 @@ public function getController(Request $request)
if (false === strpos($controller, ':')) {
if (method_exists($controller, '__invoke')) {
- return new $controller();
+ return $this->instantiateController($controller);
} elseif (function_exists($controller)) {
return $controller;
}
@@ -153,6 +153,18 @@ protected function createController($controller)
throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
}
- return array(new $class(), $method);
+ return array($this->instantiateController($class), $method);
+ }
+
+ /**
+ * Returns an instantiated controller
+ *
+ * @param string $class A class name
+ *
+ * @return object
+ */
+ protected function instantiateController($class)
+ {
+ return new $class();
}
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
index 8a35ebc70fc6914baf2ae174be18f4c32fdc01eb..ae9f73c928f050f3c5cf140e74df92ba2f0335db 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -55,22 +55,22 @@ public function setKernel(KernelInterface $kernel = null)
public function collect(Request $request, Response $response, \Exception $exception = null)
{
$this->data = array(
- 'app_name' => $this->name,
- 'app_version' => $this->version,
- 'token' => $response->headers->get('X-Debug-Token'),
- 'symfony_version' => Kernel::VERSION,
- 'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
- 'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
- 'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
- 'php_version' => PHP_VERSION,
- 'xdebug_enabled' => extension_loaded('xdebug'),
- 'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
- 'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
- 'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
- 'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
+ 'app_name' => $this->name,
+ 'app_version' => $this->version,
+ 'token' => $response->headers->get('X-Debug-Token'),
+ 'symfony_version' => Kernel::VERSION,
+ 'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
+ 'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
+ 'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
+ 'php_version' => PHP_VERSION,
+ 'xdebug_enabled' => extension_loaded('xdebug'),
+ 'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
+ 'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
+ 'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
+ 'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
- 'bundles' => array(),
- 'sapi_name' => php_sapi_name(),
+ 'bundles' => array(),
+ 'sapi_name' => php_sapi_name(),
);
if (isset($this->kernel)) {
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
index 1835938a07263ac046b81328bbcbe45bbae068a7..5dca65298d059d0c64438759953423fbdf6e75ba 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -23,7 +23,7 @@
*/
abstract class DataCollector implements DataCollectorInterface, \Serializable
{
- protected $data;
+ protected $data = array();
/**
* @var ValueExporter
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba19540585cb593bb11144f574e94200844bfe2e
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -0,0 +1,233 @@
+<?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\HttpKernel\DataCollector;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DumpDataCollector extends DataCollector implements DataDumperInterface
+{
+ private $stopwatch;
+ private $fileLinkFormat;
+ private $dataCount = 0;
+ private $isCollected = true;
+ private $clonesCount = 0;
+ private $clonesIndex = 0;
+ private $rootRefs;
+
+ public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null)
+ {
+ $this->stopwatch = $stopwatch;
+ $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
+
+ // All clones share these properties by reference:
+ $this->rootRefs = array(
+ &$this->data,
+ &$this->dataCount,
+ &$this->isCollected,
+ &$this->clonesCount,
+ );
+ }
+
+ public function __clone()
+ {
+ $this->clonesIndex = ++$this->clonesCount;
+ }
+
+ public function dump(Data $data)
+ {
+ if ($this->stopwatch) {
+ $this->stopwatch->start('dump');
+ }
+ if ($this->isCollected) {
+ $this->isCollected = false;
+ }
+
+ $trace = PHP_VERSION_ID >= 50306 ? DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS : true;
+ if (PHP_VERSION_ID >= 50400) {
+ $trace = debug_backtrace($trace, 7);
+ } else {
+ $trace = debug_backtrace($trace);
+ }
+
+ $file = $trace[0]['file'];
+ $line = $trace[0]['line'];
+ $name = false;
+ $fileExcerpt = false;
+
+ for ($i = 1; $i < 7; ++$i) {
+ if (isset($trace[$i]['class'], $trace[$i]['function'])
+ && 'dump' === $trace[$i]['function']
+ && 'Symfony\Component\VarDumper\VarDumper' === $trace[$i]['class']
+ ) {
+ $file = $trace[$i]['file'];
+ $line = $trace[$i]['line'];
+
+ while (++$i < 7) {
+ if (isset($trace[$i]['function']) && empty($trace[$i]['class']) && 'call_user_func' !== $trace[$i]['function']) {
+ $file = $trace[$i]['file'];
+ $line = $trace[$i]['line'];
+
+ break;
+ } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
+ $info = $trace[$i]['object'];
+ $name = $info->getTemplateName();
+ $src = $info->getEnvironment()->getLoader()->getSource($name);
+ $info = $info->getDebugInfo();
+ if (isset($info[$trace[$i-1]['line']])) {
+ $file = false;
+ $line = $info[$trace[$i-1]['line']];
+ $src = explode("\n", $src);
+ $fileExcerpt = array();
+
+ for ($i = max($line - 3, 1), $max = min($line + 3, count($src)); $i <= $max; ++$i) {
+ $fileExcerpt[] = '<li'.($i === $line ? ' class="selected"' : '').'><code>'.htmlspecialchars($src[$i - 1]).'</code></li>';
+ }
+
+ $fileExcerpt = '<ol start="'.max($line - 3, 1).'">'.implode("\n", $fileExcerpt).'</ol>';
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+
+ if (false === $name) {
+ $name = strtr($file, '\\', '/');
+ $name = substr($file, strrpos($file, '/') + 1);
+ }
+
+ $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');
+ ++$this->dataCount;
+
+ if ($this->stopwatch) {
+ $this->stopwatch->stop('dump');
+ }
+ }
+
+ public function collect(Request $request, Response $response, \Exception $exception = null)
+ {
+ }
+
+ public function serialize()
+ {
+ if ($this->clonesCount !== $this->clonesIndex) {
+ return 'a:0:{}';
+ }
+
+ $ser = serialize($this->data);
+ $this->data = array();
+ $this->dataCount = 0;
+ $this->isCollected = true;
+
+ return $ser;
+ }
+
+ public function unserialize($data)
+ {
+ parent::unserialize($data);
+ $this->dataCount = count($this->data);
+ self::__construct($this->stopwatch);
+ }
+
+ public function getDumpsCount()
+ {
+ return $this->dataCount;
+ }
+
+ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
+ {
+ if ('html' === $format) {
+ $dumper = new HtmlDumper();
+ } else {
+ throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
+ }
+ $dumps = array();
+
+ foreach ($this->data as $dump) {
+ $data = '';
+ $dumper->dump(
+ $dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth),
+ function ($line, $depth) use (&$data) {
+ if (-1 !== $depth) {
+ $data .= str_repeat(' ', $depth).$line."\n";
+ }
+ }
+ );
+ $dump['data'] = $data;
+ $dumps[] = $dump;
+ }
+
+ return $dumps;
+ }
+
+ public function getName()
+ {
+ return 'dump';
+ }
+
+ public function __destruct()
+ {
+ if (0 === $this->clonesCount-- && !$this->isCollected && $this->data) {
+ $this->clonesCount = 0;
+ $this->isCollected = true;
+
+ $h = headers_list();
+ $i = count($h);
+ array_unshift($h, 'Content-Type: '.ini_get('default_mimetype'));
+ while (0 !== stripos($h[$i], 'Content-Type:')) {
+ --$i;
+ }
+
+ if ('cli' !== PHP_SAPI && stripos($h[$i], 'html')) {
+ echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
+ $dumper = new HtmlDumper('php://output');
+ } else {
+ $dumper = new CliDumper('php://output');
+ $dumper->setColors(false);
+ }
+
+ foreach ($this->data as $i => $dump) {
+ $this->data[$i] = null;
+
+ if ($dumper instanceof HtmlDumper) {
+ $dump['name'] = htmlspecialchars($dump['name'], ENT_QUOTES, 'UTF-8');
+ $dump['file'] = htmlspecialchars($dump['file'], ENT_QUOTES, 'UTF-8');
+ if ('' !== $dump['file']) {
+ if ($this->fileLinkFormat) {
+ $link = strtr($this->fileLinkFormat, array('%f' => $dump['file'], '%l' => $dump['line']));
+ $dump['name'] = sprintf('<a href="%s" title="%s">%s</a>', $link, $dump['file'], $dump['name']);
+ } else {
+ $dump['name'] = sprintf('<abbr title="%s">%s</abbr>', $dump['file'], $dump['name']);
+ }
+ }
+ echo "\n<span class=\"sf-dump-meta\">{$dump['name']} on line {$dump['line']}:</span>";
+ } else {
+ echo "{$dump['name']} on line {$dump['line']}:\n";
+ }
+ $dumper->dump($dump['data']);
+ }
+
+ $this->data = array();
+ $this->dataCount = 0;
+ }
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
index 418ed686c64d8456e93cb3e320bba110c35c1bbb..0a87bc38926deac6e809b2ddbd8b7f810a5264c2 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -36,7 +36,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null)
public function collect(Request $request, Response $response, \Exception $exception = null)
{
$this->data = array(
- 'called_listeners' => array(),
+ 'called_listeners' => array(),
'not_called_listeners' => array(),
);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index 48cde6695b2d609622b9fac1df480ba9994564e3..0d1decda3a01d2017ee20b3447c983228023256b 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\HttpKernel\DataCollector;
-use Symfony\Component\Debug\ErrorHandler;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
@@ -99,7 +98,11 @@ public function getName()
private function sanitizeLogs($logs)
{
foreach ($logs as $i => $log) {
- $logs[$i]['context'] = $this->sanitizeContext($log['context']);
+ $context = $this->sanitizeContext($log['context']);
+ if (isset($context['type'], $context['level']) && !($context['type'] & $context['level'])) {
+ $context['scream'] = true;
+ }
+ $logs[$i]['context'] = $context;
}
return $logs;
@@ -145,10 +148,10 @@ private function computeErrorsCount()
);
}
- if (isset($log['context']['type'])) {
- if (ErrorHandler::TYPE_DEPRECATION === $log['context']['type']) {
+ if (isset($log['context']['type'], $log['context']['level'])) {
+ if (E_DEPRECATED === $log['context']['type'] || E_USER_DEPRECATED === $log['context']['type']) {
++$count['deprecation_count'];
- } elseif (isset($log['context']['scream'])) {
+ } elseif (!($log['context']['type'] & $log['context']['level'])) {
++$count['scream_count'];
}
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
index 70f0c24b2a8bf9d99c198db233f17ae7986b7985..501600563cd17d560d8401cc522a896366f5fac6 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -24,7 +24,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
public function __construct()
{
$this->data = array(
- 'memory' => 0,
+ 'memory' => 0,
'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index 9c19f06783de341fbda0a98875367ca82002b6b2..f0df74a365a05760d1652c8241db9323e5b0d421 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -89,24 +89,24 @@ public function collect(Request $request, Response $response, \Exception $except
$statusCode = $response->getStatusCode();
$this->data = array(
- 'format' => $request->getRequestFormat(),
- 'content' => $content,
- 'content_type' => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
- 'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
- 'status_code' => $statusCode,
- 'request_query' => $request->query->all(),
- 'request_request' => $request->request->all(),
- 'request_headers' => $request->headers->all(),
- 'request_server' => $request->server->all(),
- 'request_cookies' => $request->cookies->all(),
+ 'format' => $request->getRequestFormat(),
+ 'content' => $content,
+ 'content_type' => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
+ 'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
+ 'status_code' => $statusCode,
+ 'request_query' => $request->query->all(),
+ 'request_request' => $request->request->all(),
+ 'request_headers' => $request->headers->all(),
+ 'request_server' => $request->server->all(),
+ 'request_cookies' => $request->cookies->all(),
'request_attributes' => $attributes,
- 'response_headers' => $responseHeaders,
- 'session_metadata' => $sessionMetadata,
+ 'response_headers' => $responseHeaders,
+ 'session_metadata' => $sessionMetadata,
'session_attributes' => $sessionAttributes,
- 'flashes' => $flashes,
- 'path_info' => $request->getPathInfo(),
- 'controller' => 'n/a',
- 'locale' => $request->getLocale(),
+ 'flashes' => $flashes,
+ 'path_info' => $request->getPathInfo(),
+ 'controller' => 'n/a',
+ 'locale' => $request->getLocale(),
);
if (isset($this->data['request_headers']['php-auth-pw'])) {
@@ -123,29 +123,29 @@ public function collect(Request $request, Response $response, \Exception $except
try {
$r = new \ReflectionMethod($controller[0], $controller[1]);
$this->data['controller'] = array(
- 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
+ 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
'method' => $controller[1],
- 'file' => $r->getFilename(),
- 'line' => $r->getStartLine(),
+ 'file' => $r->getFilename(),
+ 'line' => $r->getStartLine(),
);
} catch (\ReflectionException $re) {
if (is_callable($controller)) {
// using __call or __callStatic
$this->data['controller'] = array(
- 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
+ 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
'method' => $controller[1],
- 'file' => 'n/a',
- 'line' => 'n/a',
+ 'file' => 'n/a',
+ 'line' => 'n/a',
);
}
}
} elseif ($controller instanceof \Closure) {
$r = new \ReflectionFunction($controller);
$this->data['controller'] = array(
- 'class' => $r->getName(),
+ 'class' => $r->getName(),
'method' => null,
- 'file' => $r->getFilename(),
- 'line' => $r->getStartLine(),
+ 'file' => $r->getFilename(),
+ 'line' => $r->getStartLine(),
);
} else {
$this->data['controller'] = (string) $controller ?: 'n/a';
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
index a0fbac9472a720bec768068d3648640a565b1e97..05392a0a96e8eda7919c75360c22ef181ad855c6 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -31,8 +31,8 @@ public function __construct()
$this->data = array(
'redirect' => false,
- 'url' => null,
- 'route' => null,
+ 'url' => null,
+ 'route' => null,
);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
index b076daf58146703f55ccde11df62645ca40bff10..1ea25568c4d018d59a4866e8f7c895b8c9365c12 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -43,9 +43,9 @@ public function collect(Request $request, Response $response, \Exception $except
}
$this->data = array(
- 'token' => $response->headers->get('X-Debug-Token'),
+ 'token' => $response->headers->get('X-Debug-Token'),
'start_time' => $startTime * 1000,
- 'events' => array(),
+ 'events' => array(),
);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
index 31b60e6e40c98f55c991135ad335ad84e9b1bcb9..1d78fb5c0e6a5b1560b007d59340e83b727acd86 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
@@ -28,6 +28,10 @@ class ValueExporter
public function exportValue($value, $depth = 1, $deep = false)
{
if (is_object($value)) {
+ if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
+ return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ISO8601));
+ }
+
return sprintf('Object(%s)', get_class($value));
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
index 4b7baf4ee5fbbee93601b20bd4ca977fb1e2141c..f50e4d6c3b9c149705a3fbc5e46b6d221b2c3a24 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -11,34 +11,113 @@
namespace Symfony\Component\HttpKernel\EventListener;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Debug\ErrorHandler;
use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\KernelEvent;
use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleEvent;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
/**
- * Configures the ExceptionHandler.
+ * Configures errors and exceptions handlers.
*
* @author Nicolas Grekas <p@tchwork.com>
*/
class DebugHandlersListener implements EventSubscriberInterface
{
private $exceptionHandler;
+ private $logger;
+ private $levels;
+ private $throwAt;
+ private $scream;
+ private $fileLinkFormat;
+ private $firstCall = true;
- public function __construct($exceptionHandler)
+ /**
+ * @param callable|null $exceptionHandler A handler that will be called on Exception
+ * @param LoggerInterface|null $logger A PSR-3 logger
+ * @param array|int $levels An array map of E_* to LogLevel::* or an integer bit field of E_* constants
+ * @param int|null $throwAt Thrown errors in a bit field of E_* constants, or null to keep the current value
+ * @param bool $scream Enables/disables screaming mode, where even silenced errors are logged
+ * @param string $fileLinkFormat The format for links to source files
+ */
+ public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $throwAt = -1, $scream = true, $fileLinkFormat = null)
{
- if (is_callable($exceptionHandler)) {
- $this->exceptionHandler = $exceptionHandler;
- }
+ $this->exceptionHandler = $exceptionHandler;
+ $this->logger = $logger;
+ $this->levels = $levels;
+ $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? -1 : null));
+ $this->scream = (bool) $scream;
+ $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
}
- public function configure()
+ /**
+ * Configures the error handler.
+ *
+ * @param Event|null $event The triggering event
+ */
+ public function configure(Event $event = null)
{
+ if (!$this->firstCall) {
+ return;
+ }
+ $this->firstCall = false;
+ if ($this->logger || null !== $this->throwAt) {
+ $handler = set_error_handler('var_dump', 0);
+ $handler = is_array($handler) ? $handler[0] : null;
+ restore_error_handler();
+ if ($handler instanceof ErrorHandler) {
+ if ($this->logger) {
+ $handler->setDefaultLogger($this->logger, $this->levels);
+ if (is_array($this->levels)) {
+ $scream = 0;
+ foreach ($this->levels as $type => $log) {
+ $scream |= $type;
+ }
+ } else {
+ $scream = null === $this->levels ? E_ALL | E_STRICT : $this->levels;
+ }
+ if ($this->scream) {
+ $handler->screamAt($scream);
+ }
+ $this->logger = $this->levels = null;
+ }
+ if (null !== $this->throwAt) {
+ $handler->throwAt($this->throwAt, true);
+ }
+ }
+ }
+ if (!$this->exceptionHandler) {
+ if ($event instanceof KernelEvent) {
+ $this->exceptionHandler = array($event->getKernel(), 'terminateWithException');
+ } elseif ($event instanceof ConsoleEvent && $app = $event->getCommand()->getApplication()) {
+ $output = $event->getOutput();
+ if ($output instanceof ConsoleOutputInterface) {
+ $output = $output->getErrorOutput();
+ }
+ $this->exceptionHandler = function ($e) use ($app, $output) {
+ $app->renderException($e, $output);
+ };
+ }
+ }
if ($this->exceptionHandler) {
$handler = set_exception_handler('var_dump');
$handler = is_array($handler) ? $handler[0] : null;
restore_exception_handler();
+ if ($handler instanceof ErrorHandler) {
+ $h = $handler->setExceptionHandler('var_dump') ?: $this->exceptionHandler;
+ $handler->setExceptionHandler($h);
+ $handler = is_array($h) ? $h[0] : null;
+ }
if ($handler instanceof ExceptionHandler) {
$handler->setHandler($this->exceptionHandler);
+ if (null !== $this->fileLinkFormat) {
+ $handler->setFileLinkFormat($this->fileLinkFormat);
+ }
}
$this->exceptionHandler = null;
}
@@ -46,6 +125,12 @@ public function configure()
public static function getSubscribedEvents()
{
- return array(KernelEvents::REQUEST => array('configure', 2048));
+ $events = array(KernelEvents::REQUEST => array('configure', 2048));
+
+ if (defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
+ $events[ConsoleEvents::COMMAND] = array('configure', 2048);
+ }
+
+ return $events;
}
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DumpListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..46833959b20dc2190ad1ff52814a69e3a62b075f
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DumpListener.php
@@ -0,0 +1,61 @@
+<?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\HttpKernel\EventListener;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\VarDumper\VarDumper;
+
+/**
+ * Configures dump() handler.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DumpListener implements EventSubscriberInterface
+{
+ private $container;
+ private $dumper;
+
+ /**
+ * @param ContainerInterface $container Service container, for lazy loading.
+ * @param string $dumper var_dumper dumper service to use.
+ */
+ public function __construct(ContainerInterface $container, $dumper)
+ {
+ $this->container = $container;
+ $this->dumper = $dumper;
+ }
+
+ public function configure()
+ {
+ if ($this->container) {
+ $container = $this->container;
+ $dumper = $this->dumper;
+ $this->container = null;
+
+ VarDumper::setHandler(function ($var) use ($container, $dumper) {
+ $dumper = $container->get($dumper);
+ $cloner = $container->get('var_dumper.cloner');
+ $handler = function ($var) use ($dumper, $cloner) {$dumper->dump($cloner->cloneVar($var));};
+ VarDumper::setHandler($handler);
+ $handler($var);
+ });
+ }
+ }
+
+ public static function getSubscribedEvents()
+ {
+ // Register early to have a working dump() as early as possible
+ return array(KernelEvents::REQUEST => array('configure', 1024));
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php
index 025b6475a4632320fc8ad31a223beb82950cf68f..d5400b7d6ee019e52f53f906f2a58e86f3f29243 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php
@@ -21,6 +21,8 @@
*
* @author Colin Frei <colin@colinfrei.com>
* @author Konstantin Myakshin <koc-dp@yandex.ru>
+ *
+ * @deprecated since 2.6, to be removed in 3.0. Use DebugHandlersListener instead.
*/
class ErrorsLoggerListener implements EventSubscriberInterface
{
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/EsiListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/EsiListener.php
index 686778afc4ad8de72fe911e895513c376d942fc8..63801690174daba8390e8d7004509bb2c502512c 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/EsiListener.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/EsiListener.php
@@ -11,48 +11,13 @@
namespace Symfony\Component\HttpKernel\EventListener;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\HttpCache\Esi;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
/**
* EsiListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
*
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use SurrogateListener instead
*/
-class EsiListener implements EventSubscriberInterface
+class EsiListener extends SurrogateListener
{
- private $esi;
-
- /**
- * Constructor.
- *
- * @param Esi $esi An ESI instance
- */
- public function __construct(Esi $esi = null)
- {
- $this->esi = $esi;
- }
-
- /**
- * Filters the Response.
- *
- * @param FilterResponseEvent $event A FilterResponseEvent instance
- */
- public function onKernelResponse(FilterResponseEvent $event)
- {
- if (!$event->isMasterRequest() || null === $this->esi) {
- return;
- }
-
- $this->esi->addSurrogateControl($event->getResponse());
- }
-
- public static function getSubscribedEvents()
- {
- return array(
- KernelEvents::RESPONSE => 'onKernelResponse',
- );
- }
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9eaa68f49ae7e890fcfc5074ce562048eaac06a
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
@@ -0,0 +1,67 @@
+<?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\HttpKernel\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Saves the session, in case it is still open, before sending the response/headers.
+ *
+ * This ensures several things in case the developer did not save the session explicitly:
+ *
+ * * If a session save handler without locking is used, it ensures the data is available
+ * on the next request, e.g. after a redirect. PHPs auto-save at script end via
+ * session_register_shutdown is executed after fastcgi_finish_request. So in this case
+ * the data could be missing the next request because it might not be saved the moment
+ * the new request is processed.
+ * * A locking save handler (e.g. the native 'files') circumvents concurrency problems like
+ * the one above. But by saving the session before long-running things in the terminate event,
+ * we ensure the session is not blocked longer than needed.
+ * * When regenerating the session ID no locking is involved in PHPs session design. See
+ * https://bugs.php.net/bug.php?id=61470 for a discussion. So in this case, the session must
+ * be saved anyway before sending the headers with the new session ID. Otherwise session
+ * data could get lost again for concurrent requests with the new ID. One result could be
+ * that you get logged out after just logging in.
+ *
+ * This listener should be executed as one of the last listeners, so that previous listeners
+ * can still operate on the open session. This prevents the overhead of restarting it.
+ * Listeners after closing the session can still work with the session as usual because
+ * Symfonys session implementation starts the session on demand. So writing to it after
+ * it is saved will just restart it.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class SaveSessionListener implements EventSubscriberInterface
+{
+ public function onKernelResponse(FilterResponseEvent $event)
+ {
+ if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+ return;
+ }
+
+ $session = $event->getRequest()->getSession();
+ if ($session && $session->isStarted()) {
+ $session->save();
+ }
+ }
+
+ public static function getSubscribedEvents()
+ {
+ return array(
+ // low priority but higher than StreamedResponseListener
+ KernelEvents::RESPONSE => array(array('onKernelResponse', -1000)),
+ );
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..00f4fbf24ee742c003d576d378554b30fbc334b7
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
@@ -0,0 +1,58 @@
+<?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\HttpKernel\EventListener;
+
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpCache\SurrogateInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * SurrogateListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for Surrogates
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class SurrogateListener implements EventSubscriberInterface
+{
+ private $surrogate;
+
+ /**
+ * Constructor.
+ *
+ * @param SurrogateInterface $surrogate An SurrogateInterface instance
+ */
+ public function __construct(SurrogateInterface $surrogate = null)
+ {
+ $this->surrogate = $surrogate;
+ }
+
+ /**
+ * Filters the Response.
+ *
+ * @param FilterResponseEvent $event A FilterResponseEvent instance
+ */
+ public function onKernelResponse(FilterResponseEvent $event)
+ {
+ if (!$event->isMasterRequest() || null === $this->surrogate) {
+ return;
+ }
+
+ $this->surrogate->addSurrogateControl($event->getResponse());
+ }
+
+ public static function getSubscribedEvents()
+ {
+ return array(
+ KernelEvents::RESPONSE => 'onKernelResponse',
+ );
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..6967ad0298b59aa8955d4b894d05f69727cda1fa
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php
@@ -0,0 +1,69 @@
+<?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\HttpKernel\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Translation\TranslatorInterface;
+
+/**
+ * Synchronizes the locale between the request and the translator.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class TranslatorListener implements EventSubscriberInterface
+{
+ private $translator;
+ private $requestStack;
+
+ public function __construct(TranslatorInterface $translator, RequestStack $requestStack)
+ {
+ $this->translator = $translator;
+ $this->requestStack = $requestStack;
+ }
+
+ public function onKernelRequest(GetResponseEvent $event)
+ {
+ $this->setLocale($event->getRequest());
+ }
+
+ public function onKernelFinishRequest(FinishRequestEvent $event)
+ {
+ if (null === $parentRequest = $this->requestStack->getParentRequest()) {
+ return;
+ }
+
+ $this->setLocale($parentRequest);
+ }
+
+ public static function getSubscribedEvents()
+ {
+ return array(
+ // must be registered after the Locale listener
+ KernelEvents::REQUEST => array(array('onKernelRequest', 10)),
+ KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
+ );
+ }
+
+ private function setLocale(Request $request)
+ {
+ try {
+ $this->translator->setLocale($request->getLocale());
+ } catch (\InvalidArgumentException $e) {
+ $this->translator->setLocale($request->getDefaultLocale());
+ }
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
new file mode 100644
index 0000000000000000000000000000000000000000..1968001a86b9864cbae644c61a48fbe5ea0079d4
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -0,0 +1,95 @@
+<?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\HttpKernel\Fragment;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+use Symfony\Component\HttpKernel\HttpCache\SurrogateInterface;
+use Symfony\Component\HttpKernel\UriSigner;
+
+/**
+ * Implements Surrogate rendering strategy.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRenderer
+{
+ private $surrogate;
+ private $inlineStrategy;
+ private $signer;
+
+ /**
+ * Constructor.
+ *
+ * The "fallback" strategy when surrogate is not available should always be an
+ * instance of InlineFragmentRenderer.
+ *
+ * @param SurrogateInterface $surrogate An Surrogate instance
+ * @param FragmentRendererInterface $inlineStrategy The inline strategy to use when the surrogate is not supported
+ * @param UriSigner $signer
+ */
+ public function __construct(SurrogateInterface $surrogate = null, FragmentRendererInterface $inlineStrategy, UriSigner $signer = null)
+ {
+ $this->surrogate = $surrogate;
+ $this->inlineStrategy = $inlineStrategy;
+ $this->signer = $signer;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * Note that if the current Request has no surrogate capability, this method
+ * falls back to use the inline rendering strategy.
+ *
+ * Additional available options:
+ *
+ * * alt: an alternative URI to render in case of an error
+ * * comment: a comment to add when returning the surrogate tag
+ *
+ * Note, that not all surrogate strategies support all options. For now
+ * 'alt' and 'comment' are only supported by ESI.
+ *
+ * @see Symfony\Component\HttpKernel\HttpCache\SurrogateInterface
+ */
+ public function render($uri, Request $request, array $options = array())
+ {
+ if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
+ return $this->inlineStrategy->render($uri, $request, $options);
+ }
+
+ if ($uri instanceof ControllerReference) {
+ $uri = $this->generateSignedFragmentUri($uri, $request);
+ }
+
+ $alt = isset($options['alt']) ? $options['alt'] : null;
+ if ($alt instanceof ControllerReference) {
+ $alt = $this->generateSignedFragmentUri($alt, $request);
+ }
+
+ $tag = $this->surrogate->renderIncludeTag($uri, $alt, isset($options['ignore_errors']) ? $options['ignore_errors'] : false, isset($options['comment']) ? $options['comment'] : '');
+
+ return new Response($tag);
+ }
+
+ private function generateSignedFragmentUri($uri, Request $request)
+ {
+ if (null === $this->signer) {
+ throw new \LogicException('You must use a URI when using the ESI rendering strategy or set a URL signer.');
+ }
+
+ // we need to sign the absolute URI, but want to return the path only.
+ $fragmentUri = $this->signer->sign($this->generateFragmentUri($uri, $request, true));
+
+ return substr($fragmentUri, strlen($request->getSchemeAndHttpHost()));
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
index 772884d6341bdfea2509cdfa849edb181c643d33..a4570e3beb0d4ae7db7c094d7582db490e4c2576 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
@@ -11,73 +11,13 @@
namespace Symfony\Component\HttpKernel\Fragment;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\HttpCache\Esi;
-use Symfony\Component\HttpKernel\UriSigner;
-
/**
* Implements the ESI rendering strategy.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class EsiFragmentRenderer extends RoutableFragmentRenderer
+class EsiFragmentRenderer extends AbstractSurrogateFragmentRenderer
{
- private $esi;
- private $inlineStrategy;
- private $signer;
-
- /**
- * Constructor.
- *
- * The "fallback" strategy when ESI is not available should always be an
- * instance of InlineFragmentRenderer.
- *
- * @param Esi $esi An Esi instance
- * @param FragmentRendererInterface $inlineStrategy The inline strategy to use when ESI is not supported
- * @param UriSigner $signer
- */
- public function __construct(Esi $esi = null, InlineFragmentRenderer $inlineStrategy, UriSigner $signer = null)
- {
- $this->esi = $esi;
- $this->inlineStrategy = $inlineStrategy;
- $this->signer = $signer;
- }
-
- /**
- * {@inheritdoc}
- *
- * Note that if the current Request has no ESI capability, this method
- * falls back to use the inline rendering strategy.
- *
- * Additional available options:
- *
- * * alt: an alternative URI to render in case of an error
- * * comment: a comment to add when returning an esi:include tag
- *
- * @see Symfony\Component\HttpKernel\HttpCache\ESI
- */
- public function render($uri, Request $request, array $options = array())
- {
- if (!$this->esi || !$this->esi->hasSurrogateEsiCapability($request)) {
- return $this->inlineStrategy->render($uri, $request, $options);
- }
-
- if ($uri instanceof ControllerReference) {
- $uri = $this->generateSignedFragmentUri($uri, $request);
- }
-
- $alt = isset($options['alt']) ? $options['alt'] : null;
- if ($alt instanceof ControllerReference) {
- $alt = $this->generateSignedFragmentUri($alt, $request);
- }
-
- $tag = $this->esi->renderIncludeTag($uri, $alt, isset($options['ignore_errors']) ? $options['ignore_errors'] : false, isset($options['comment']) ? $options['comment'] : '');
-
- return new Response($tag);
- }
-
/**
* {@inheritdoc}
*/
@@ -85,16 +25,4 @@ public function getName()
{
return 'esi';
}
-
- private function generateSignedFragmentUri($uri, Request $request)
- {
- if (null === $this->signer) {
- throw new \LogicException('You must use a URI when using the ESI rendering strategy or set a URL signer.');
- }
-
- // we need to sign the absolute URI, but want to return the path only.
- $fragmentUri = $this->signer->sign($this->generateFragmentUri($uri, $request, true));
-
- return substr($fragmentUri, strlen($request->getSchemeAndHttpHost()));
- }
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/SsiFragmentRenderer.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/SsiFragmentRenderer.php
new file mode 100644
index 0000000000000000000000000000000000000000..45e7122f05f1e7a3965c9886e603964d3c495910
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/SsiFragmentRenderer.php
@@ -0,0 +1,28 @@
+<?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\HttpKernel\Fragment;
+
+/**
+ * Implements the SSI rendering strategy.
+ *
+ * @author Sebastian Krebs <krebs.seb@gmail.com>
+ */
+class SsiFragmentRenderer extends AbstractSurrogateFragmentRenderer
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'ssi';
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 9dd99d64cc49172f50c1198994e9dbf91639f643..c3ec0e4551d8bdd22115cd31ed0f9d921ee55cdd 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -26,7 +26,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Esi
+class Esi implements SurrogateInterface
{
private $contentTypes;
@@ -41,10 +41,15 @@ public function __construct(array $contentTypes = array('text/html', 'text/xml',
$this->contentTypes = $contentTypes;
}
+ public function getName()
+ {
+ return 'esi';
+ }
+
/**
* Returns a new cache strategy instance.
*
- * @return EsiResponseCacheStrategyInterface A EsiResponseCacheStrategyInterface instance
+ * @return ResponseCacheStrategyInterface A ResponseCacheStrategyInterface instance
*/
public function createCacheStrategy()
{
@@ -58,6 +63,20 @@ public function createCacheStrategy()
*
* @return bool true if one surrogate has ESI/1.0 capability, false otherwise
*/
+ public function hasSurrogateCapability(Request $request)
+ {
+ return $this->hasSurrogateEsiCapability($request);
+ }
+
+ /**
+ * Checks that at least one surrogate has ESI/1.0 capability.
+ *
+ * @param Request $request A Request instance
+ *
+ * @return bool true if one surrogate has ESI/1.0 capability, false otherwise
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use hasSurrogateCapability() instead
+ */
public function hasSurrogateEsiCapability(Request $request)
{
if (null === $value = $request->headers->get('Surrogate-Capability')) {
@@ -72,6 +91,18 @@ public function hasSurrogateEsiCapability(Request $request)
*
* @param Request $request A Request instance
*/
+ public function addSurrogateCapability(Request $request)
+ {
+ $this->addSurrogateEsiCapability($request);
+ }
+
+ /**
+ * Adds ESI/1.0 capability to the given Request.
+ *
+ * @param Request $request A Request instance
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use addSurrogateCapability() instead
+ */
public function addSurrogateEsiCapability(Request $request)
{
$current = $request->headers->get('Surrogate-Capability');
@@ -101,6 +132,20 @@ public function addSurrogateControl(Response $response)
*
* @return bool true if the Response needs to be parsed, false otherwise
*/
+ public function needsParsing(Response $response)
+ {
+ return $this->needsEsiParsing($response);
+ }
+
+ /**
+ * Checks that the Response needs to be parsed for ESI tags.
+ *
+ * @param Response $response A Response instance
+ *
+ * @return bool true if the Response needs to be parsed, false otherwise
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use needsParsing() instead
+ */
public function needsEsiParsing(Response $response)
{
if (!$control = $response->headers->get('Surrogate-Control')) {
@@ -236,7 +281,7 @@ private function handleEsiIncludeTag($attributes)
throw new \RuntimeException('Unable to process an ESI tag without a "src" attribute.');
}
- return sprintf('<?php echo $this->esi->handle($this, %s, %s, %s) ?>'."\n",
+ return sprintf('<?php echo $this->surrogate->handle($this, %s, %s, %s) ?>'."\n",
var_export($options['src'], true),
var_export(isset($options['alt']) ? $options['alt'] : '', true),
isset($options['onerror']) && 'continue' == $options['onerror'] ? 'true' : 'false'
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
index 6384af9660a8b8cf9547a56563e1ad4739985d3f..1bef1475958979f7e83363a68c0689d2480dfb54 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
@@ -15,8 +15,6 @@
namespace Symfony\Component\HttpKernel\HttpCache;
-use Symfony\Component\HttpFoundation\Response;
-
/**
* EsiResponseCacheStrategy knows how to compute the Response cache HTTP header
* based on the different ESI response cache headers.
@@ -25,61 +23,9 @@
* or force validation if one of the ESI has validation cache strategy.
*
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use ResponseCacheStrategy instead
*/
-class EsiResponseCacheStrategy implements EsiResponseCacheStrategyInterface
+class EsiResponseCacheStrategy extends ResponseCacheStrategy implements EsiResponseCacheStrategyInterface
{
- private $cacheable = true;
- private $embeddedResponses = 0;
- private $ttls = array();
- private $maxAges = array();
-
- /**
- * {@inheritdoc}
- */
- public function add(Response $response)
- {
- if ($response->isValidateable()) {
- $this->cacheable = false;
- } else {
- $this->ttls[] = $response->getTtl();
- $this->maxAges[] = $response->getMaxAge();
- }
-
- $this->embeddedResponses++;
- }
-
- /**
- * {@inheritdoc}
- */
- public function update(Response $response)
- {
- // if we have no embedded Response, do nothing
- if (0 === $this->embeddedResponses) {
- return;
- }
-
- // Remove validation related headers in order to avoid browsers using
- // their own cache, because some of the response content comes from
- // at least one embedded response (which likely has a different caching strategy).
- if ($response->isValidateable()) {
- $response->setEtag(null);
- $response->setLastModified(null);
- $this->cacheable = false;
- }
-
- if (!$this->cacheable) {
- $response->headers->set('Cache-Control', 'no-cache, must-revalidate');
-
- return;
- }
-
- $this->ttls[] = $response->getTtl();
- $this->maxAges[] = $response->getMaxAge();
-
- if (null !== $maxAge = min($this->maxAges)) {
- $response->setSharedMaxAge($maxAge);
- $response->headers->set('Age', $maxAge - min($this->ttls));
- }
- $response->setMaxAge(0);
- }
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
index 0fb8a12436f62349bdde185b7de9c7cc39858277..03df0575a58378ed726d885806118eab05faa044 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
@@ -15,27 +15,14 @@
namespace Symfony\Component\HttpKernel\HttpCache;
-use Symfony\Component\HttpFoundation\Response;
-
/**
- * EsiResponseCacheStrategyInterface implementations know how to compute the
- * Response cache HTTP header based on the different ESI response cache headers.
+ * ResponseCacheStrategyInterface implementations know how to compute the
+ * Response cache HTTP header based on the different response cache headers.
*
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use ResponseCacheStrategyInterface instead
*/
-interface EsiResponseCacheStrategyInterface
+interface EsiResponseCacheStrategyInterface extends ResponseCacheStrategyInterface
{
- /**
- * Adds a Response.
- *
- * @param Response $response
- */
- public function add(Response $response);
-
- /**
- * Updates the Response HTTP headers based on the embedded Responses.
- *
- * @param Response $response
- */
- public function update(Response $response);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index f65eb2371baa23bfdd3ceac2e86858a85b8ddd2b..6e5e84ebce9796d06b583ac0b2c3cf9bf6cc0841 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -32,8 +32,8 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
private $kernel;
private $store;
private $request;
- private $esi;
- private $esiCacheStrategy;
+ private $surrogate;
+ private $surrogateCacheStrategy;
private $options = array();
private $traces = array();
@@ -72,28 +72,28 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* This setting is overridden by the stale-if-error HTTP Cache-Control extension
* (see RFC 5861).
*
- * @param HttpKernelInterface $kernel An HttpKernelInterface instance
- * @param StoreInterface $store A Store instance
- * @param Esi $esi An Esi instance
- * @param array $options An array of options
+ * @param HttpKernelInterface $kernel An HttpKernelInterface instance
+ * @param StoreInterface $store A Store instance
+ * @param SurrogateInterface $surrogate A SurrogateInterface instance
+ * @param array $options An array of options
*/
- public function __construct(HttpKernelInterface $kernel, StoreInterface $store, Esi $esi = null, array $options = array())
+ public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = array())
{
$this->store = $store;
$this->kernel = $kernel;
- $this->esi = $esi;
+ $this->surrogate = $surrogate;
// needed in case there is a fatal error because the backend is too slow to respond
register_shutdown_function(array($this->store, 'cleanup'));
$this->options = array_merge(array(
- 'debug' => false,
- 'default_ttl' => 0,
- 'private_headers' => array('Authorization', 'Cookie'),
- 'allow_reload' => false,
- 'allow_revalidate' => false,
+ 'debug' => false,
+ 'default_ttl' => 0,
+ 'private_headers' => array('Authorization', 'Cookie'),
+ 'allow_reload' => false,
+ 'allow_revalidate' => false,
'stale_while_revalidate' => 2,
- 'stale_if_error' => 60,
+ 'stale_if_error' => 60,
), $options);
}
@@ -152,14 +152,32 @@ public function getKernel()
return $this->kernel;
}
+ /**
+ * Gets the Surrogate instance
+ *
+ * @throws \LogicException
+ * @return SurrogateInterface A Surrogate instance
+ */
+ public function getSurrogate()
+ {
+ return $this->getEsi();
+ }
+
/**
* Gets the Esi instance
*
+ * @throws \LogicException
* @return Esi An Esi instance
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use getSurrogate() instead
*/
public function getEsi()
{
- return $this->esi;
+ if (!$this->surrogate instanceof Esi) {
+ throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
+ }
+
+ return $this->surrogate;
}
/**
@@ -173,8 +191,8 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
if (HttpKernelInterface::MASTER_REQUEST === $type) {
$this->traces = array();
$this->request = $request;
- if (null !== $this->esi) {
- $this->esiCacheStrategy = $this->esi->createCacheStrategy();
+ if (null !== $this->surrogate) {
+ $this->surrogateCacheStrategy = $this->surrogate->createCacheStrategy();
}
}
@@ -200,11 +218,11 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
$response->headers->set('X-Symfony-Cache', $this->getLog());
}
- if (null !== $this->esi) {
+ if (null !== $this->surrogate) {
if (HttpKernelInterface::MASTER_REQUEST === $type) {
- $this->esiCacheStrategy->update($response);
+ $this->surrogateCacheStrategy->update($response);
} else {
- $this->esiCacheStrategy->add($response);
+ $this->surrogateCacheStrategy->add($response);
}
}
@@ -445,8 +463,8 @@ protected function fetch(Request $request, $catch = false)
*/
protected function forward(Request $request, $catch = false, Response $entry = null)
{
- if ($this->esi) {
- $this->esi->addSurrogateEsiCapability($request);
+ if ($this->surrogate) {
+ $this->surrogate->addSurrogateCapability($request);
}
// modify the X-Forwarded-For header if needed
@@ -643,8 +661,8 @@ private function restoreResponseBody(Request $request, Response $response)
protected function processResponseBody(Request $request, Response $response)
{
- if (null !== $this->esi && $this->esi->needsEsiParsing($response)) {
- $this->esi->process($request, $response);
+ if (null !== $this->surrogate && $this->surrogate->needsParsing($response)) {
+ $this->surrogate->process($request, $response);
}
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..d22dff1e5f08f56e4cdcec67f666f19b89dbd01e
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * This code is partially based on the Rack-Cache library by Ryan Tomayko,
+ * which is released under the MIT license.
+ * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * ResponseCacheStrategy knows how to compute the Response cache HTTP header
+ * based on the different response cache headers.
+ *
+ * This implementation changes the master response TTL to the smallest TTL received
+ * or force validation if one of the surrogates has validation cache strategy.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class ResponseCacheStrategy implements ResponseCacheStrategyInterface
+{
+ private $cacheable = true;
+ private $embeddedResponses = 0;
+ private $ttls = array();
+ private $maxAges = array();
+
+ /**
+ * {@inheritdoc}
+ */
+ public function add(Response $response)
+ {
+ if ($response->isValidateable()) {
+ $this->cacheable = false;
+ } else {
+ $this->ttls[] = $response->getTtl();
+ $this->maxAges[] = $response->getMaxAge();
+ }
+
+ $this->embeddedResponses++;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function update(Response $response)
+ {
+ // if we have no embedded Response, do nothing
+ if (0 === $this->embeddedResponses) {
+ return;
+ }
+
+ // Remove validation related headers in order to avoid browsers using
+ // their own cache, because some of the response content comes from
+ // at least one embedded response (which likely has a different caching strategy).
+ if ($response->isValidateable()) {
+ $response->setEtag(null);
+ $response->setLastModified(null);
+ $this->cacheable = false;
+ }
+
+ if (!$this->cacheable) {
+ $response->headers->set('Cache-Control', 'no-cache, must-revalidate');
+
+ return;
+ }
+
+ $this->ttls[] = $response->getTtl();
+ $this->maxAges[] = $response->getMaxAge();
+
+ if (null !== $maxAge = min($this->maxAges)) {
+ $response->setSharedMaxAge($maxAge);
+ $response->headers->set('Age', $maxAge - min($this->ttls));
+ }
+ $response->setMaxAge(0);
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d70c2e06ec8b03b112b13875e2d60f2cc0c7eaad
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * This code is partially based on the Rack-Cache library by Ryan Tomayko,
+ * which is released under the MIT license.
+ * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * ResponseCacheStrategyInterface implementations know how to compute the
+ * Response cache HTTP header based on the different response cache headers.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface ResponseCacheStrategyInterface
+{
+ /**
+ * Adds a Response.
+ *
+ * @param Response $response
+ */
+ public function add(Response $response);
+
+ /**
+ * Updates the Response HTTP headers based on the embedded Responses.
+ *
+ * @param Response $response
+ */
+ public function update(Response $response);
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Ssi.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fc203e595cd647896b89ed868c49d13e8e69c55
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Ssi.php
@@ -0,0 +1,195 @@
+<?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\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * Ssi implements the SSI capabilities to Request and Response instances.
+ *
+ * @author Sebastian Krebs <krebs.seb@gmail.com>
+ */
+class Ssi implements SurrogateInterface
+{
+ private $contentTypes;
+
+ /**
+ * Constructor.
+ *
+ * @param array $contentTypes An array of content-type that should be parsed for SSI information.
+ * (default: text/html, text/xml, application/xhtml+xml, and application/xml)
+ */
+ public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml'))
+ {
+ $this->contentTypes = $contentTypes;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'ssi';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function createCacheStrategy()
+ {
+ return new ResponseCacheStrategy();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function hasSurrogateCapability(Request $request)
+ {
+ if (null === $value = $request->headers->get('Surrogate-Capability')) {
+ return false;
+ }
+
+ return false !== strpos($value, 'SSI/1.0');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function addSurrogateCapability(Request $request)
+ {
+ $current = $request->headers->get('Surrogate-Capability');
+ $new = 'symfony2="SSI/1.0"';
+
+ $request->headers->set('Surrogate-Capability', $current ? $current.', '.$new : $new);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function addSurrogateControl(Response $response)
+ {
+ if (false !== strpos($response->getContent(), '<!--#include')) {
+ $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function needsParsing(Response $response)
+ {
+ if (!$control = $response->headers->get('Surrogate-Control')) {
+ return false;
+ }
+
+ return (bool) preg_match('#content="[^"]*SSI/1.0[^"]*"#', $control);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comment = '')
+ {
+ return sprintf('<!--#include virtual="%s" -->', $uri);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function process(Request $request, Response $response)
+ {
+ $this->request = $request;
+ $type = $response->headers->get('Content-Type');
+ if (empty($type)) {
+ $type = 'text/html';
+ }
+
+ $parts = explode(';', $type);
+ if (!in_array($parts[0], $this->contentTypes)) {
+ return $response;
+ }
+
+ // we don't use a proper XML parser here as we can have SSI tags in a plain text response
+ $content = $response->getContent();
+ $content = str_replace(array('<?', '<%'), array('<?php echo "<?"; ?>', '<?php echo "<%"; ?>'), $content);
+ $content = preg_replace_callback('#<!--\#include\s+(.*?)\s*-->#', array($this, 'handleIncludeTag'), $content);
+
+ $response->setContent($content);
+ $response->headers->set('X-Body-Eval', 'SSI');
+
+ // remove SSI/1.0 from the Surrogate-Control header
+ if ($response->headers->has('Surrogate-Control')) {
+ $value = $response->headers->get('Surrogate-Control');
+ if ('content="SSI/1.0"' == $value) {
+ $response->headers->remove('Surrogate-Control');
+ } elseif (preg_match('#,\s*content="SSI/1.0"#', $value)) {
+ $response->headers->set('Surrogate-Control', preg_replace('#,\s*content="SSI/1.0"#', '', $value));
+ } elseif (preg_match('#content="SSI/1.0",\s*#', $value)) {
+ $response->headers->set('Surrogate-Control', preg_replace('#content="SSI/1.0",\s*#', '', $value));
+ }
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors)
+ {
+ $subRequest = Request::create($uri, 'get', array(), $cache->getRequest()->cookies->all(), array(), $cache->getRequest()->server->all());
+
+ try {
+ $response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true);
+
+ if (!$response->isSuccessful()) {
+ throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $subRequest->getUri(), $response->getStatusCode()));
+ }
+
+ return $response->getContent();
+ } catch (\Exception $e) {
+ if ($alt) {
+ return $this->handle($cache, $alt, '', $ignoreErrors);
+ }
+
+ if (!$ignoreErrors) {
+ throw $e;
+ }
+ }
+ }
+
+ /**
+ * Handles an SSI include tag (called internally).
+ *
+ * @param array $attributes An array containing the attributes.
+ *
+ * @return string The response content for the include.
+ *
+ * @throws \RuntimeException
+ */
+ private function handleIncludeTag($attributes)
+ {
+ $options = array();
+ preg_match_all('/(virtual)="([^"]*?)"/', $attributes[1], $matches, PREG_SET_ORDER);
+ foreach ($matches as $set) {
+ $options[$set[1]] = $set[2];
+ }
+
+ if (!isset($options['virtual'])) {
+ throw new \RuntimeException('Unable to process an SSI tag without a "virtual" attribute.');
+ }
+
+ return sprintf('<?php echo $this->surrogate->handle($this, %s, \'\', false) ?>'."\n",
+ var_export($options['virtual'], true)
+ );
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..c26304dfdf25aee2fcb1e84e4e0b1d81ef5adbb6
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
@@ -0,0 +1,103 @@
+<?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\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+interface SurrogateInterface
+{
+ /**
+ * Returns surrogate name
+ *
+ * @return string
+ */
+ public function getName();
+
+ /**
+ * Returns a new cache strategy instance.
+ *
+ * @return ResponseCacheStrategyInterface A ResponseCacheStrategyInterface instance
+ */
+ public function createCacheStrategy();
+
+ /**
+ * Checks that at least one surrogate has Surrogate capability.
+ *
+ * @param Request $request A Request instance
+ *
+ * @return bool true if one surrogate has Surrogate capability, false otherwise
+ */
+ public function hasSurrogateCapability(Request $request);
+
+ /**
+ * Adds Surrogate-capability to the given Request.
+ *
+ * @param Request $request A Request instance
+ */
+ public function addSurrogateCapability(Request $request);
+
+ /**
+ * Adds HTTP headers to specify that the Response needs to be parsed for Surrogate.
+ *
+ * This method only adds an Surrogate HTTP header if the Response has some Surrogate tags.
+ *
+ * @param Response $response A Response instance
+ */
+ public function addSurrogateControl(Response $response);
+
+ /**
+ * Checks that the Response needs to be parsed for Surrogate tags.
+ *
+ * @param Response $response A Response instance
+ *
+ * @return bool true if the Response needs to be parsed, false otherwise
+ */
+ public function needsParsing(Response $response);
+
+ /**
+ * Renders a Surrogate tag.
+ *
+ * @param string $uri A URI
+ * @param string $alt An alternate URI
+ * @param bool $ignoreErrors Whether to ignore errors or not
+ * @param string $comment A comment to add as an esi:include tag
+ *
+ * @return string
+ */
+ public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comment = '');
+
+ /**
+ * Replaces a Response Surrogate tags with the included resource content.
+ *
+ * @param Request $request A Request instance
+ * @param Response $response A Response instance
+ *
+ * @return Response
+ */
+ public function process(Request $request, Response $response);
+
+ /**
+ * Handles a Surrogate from the cache.
+ *
+ * @param HttpCache $cache An HttpCache instance
+ * @param string $uri The main URI
+ * @param string $alt An alternative URI
+ * @param bool $ignoreErrors Whether to ignore errors or not
+ *
+ * @return string
+ *
+ * @throws \RuntimeException
+ * @throws \Exception
+ */
+ public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors);
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php
index 68d89c94e9be37e04387ce54fc3147ae5fd8f02c..0806cef7e0257ccba38b687a3d4715d939e181b2 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php
@@ -131,7 +131,7 @@ private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
// load controller
if (false === $controller = $this->resolver->getController($request)) {
- throw new NotFoundHttpException(sprintf('Unable to find the controller for path "%s". Maybe you forgot to add the matching route in your routing configuration?', $request->getPathInfo()));
+ throw new NotFoundHttpException(sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo()));
}
$event = new FilterControllerEvent($this, $controller, $request, $type);
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
index c64db087a0443287ebe61cc8c206f585063e9271..1d6e0882dafdd1703b1bac4d0d54103284ba4f43 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '2.5.5';
- const VERSION_ID = '20505';
- const MAJOR_VERSION = '2';
- const MINOR_VERSION = '5';
- const RELEASE_VERSION = '5';
- const EXTRA_VERSION = '';
+ const VERSION = '2.6.0-BETA1';
+ const VERSION_ID = '20600';
+ const MAJOR_VERSION = '2.6.0-BETA1';
+ const MINOR_VERSION = '2.6.0-BETA1';
+ const RELEASE_VERSION = '2.6.0-BETA1';
+ const EXTRA_VERSION = 'BETA1';
/**
* Constructor.
@@ -209,6 +209,8 @@ public function getBundles()
* {@inheritdoc}
*
* @api
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function isClassInActiveBundle($class)
{
@@ -584,14 +586,14 @@ protected function getKernelParameters()
return array_merge(
array(
- 'kernel.root_dir' => $this->rootDir,
- 'kernel.environment' => $this->environment,
- 'kernel.debug' => $this->debug,
- 'kernel.name' => $this->name,
- 'kernel.cache_dir' => $this->getCacheDir(),
- 'kernel.logs_dir' => $this->getLogDir(),
- 'kernel.bundles' => $bundles,
- 'kernel.charset' => $this->getCharset(),
+ 'kernel.root_dir' => $this->rootDir,
+ 'kernel.environment' => $this->environment,
+ 'kernel.debug' => $this->debug,
+ 'kernel.name' => $this->name,
+ 'kernel.cache_dir' => $this->getCacheDir(),
+ 'kernel.logs_dir' => $this->getLogDir(),
+ 'kernel.bundles' => $bundles,
+ 'kernel.charset' => $this->getCharset(),
'kernel.container_class' => $this->getContainerClass(),
),
$this->getEnvParameters()
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php
index 922f63180ffabe8218dbb77ba4e61a6b573743bc..e03c1518f337abc3b4ca74a833211fad3ed49538 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php
@@ -77,6 +77,8 @@ public function getBundles();
* @return bool true if the class belongs to an active bundle, false otherwise
*
* @api
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
public function isClassInActiveBundle($class);
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
index ba6f1952e4df8c73d0b43d7716e07f2d51c792d0..949a63936d25fbfe5ec7b8a582c94910f6df3397 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
@@ -77,12 +77,12 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
continue;
}
- $result[$itemToken] = array(
- 'token' => $itemToken,
- 'ip' => $itemIp,
+ $result[$itemToken] = array(
+ 'token' => $itemToken,
+ 'ip' => $itemIp,
'method' => $itemMethod,
- 'url' => $itemUrl,
- 'time' => $itemTime,
+ 'url' => $itemUrl,
+ 'time' => $itemTime,
'parent' => $itemParent,
);
--$limit;
@@ -152,14 +152,14 @@ public function read($token)
public function write(Profile $profile)
{
$data = array(
- 'token' => $profile->getToken(),
- 'parent' => $profile->getParentToken(),
+ 'token' => $profile->getToken(),
+ 'parent' => $profile->getParentToken(),
'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
- 'data' => $profile->getCollectors(),
- 'ip' => $profile->getIp(),
- 'method' => $profile->getMethod(),
- 'url' => $profile->getUrl(),
- 'time' => $profile->getTime(),
+ 'data' => $profile->getCollectors(),
+ 'ip' => $profile->getIp(),
+ 'method' => $profile->getMethod(),
+ 'url' => $profile->getUrl(),
+ 'time' => $profile->getTime(),
);
$profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
index b7abad735c08fdc8f4acc8b24feb4123a5fe1ab5..b08c4bdd45f9f5e439c094a692bf382c67f3bbb9 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -78,11 +78,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
}
$result[$csvToken] = array(
- 'token' => $csvToken,
- 'ip' => $csvIp,
+ 'token' => $csvToken,
+ 'ip' => $csvIp,
'method' => $csvMethod,
- 'url' => $csvUrl,
- 'time' => $csvTime,
+ 'url' => $csvUrl,
+ 'time' => $csvTime,
'parent' => $csvParent,
);
}
@@ -140,14 +140,14 @@ public function write(Profile $profile)
// Store profile
$data = array(
- 'token' => $profile->getToken(),
- 'parent' => $profile->getParentToken(),
+ 'token' => $profile->getToken(),
+ 'parent' => $profile->getParentToken(),
'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
- 'data' => $profile->getCollectors(),
- 'ip' => $profile->getIp(),
- 'method' => $profile->getMethod(),
- 'url' => $profile->getUrl(),
- 'time' => $profile->getTime(),
+ 'data' => $profile->getCollectors(),
+ 'ip' => $profile->getIp(),
+ 'method' => $profile->getMethod(),
+ 'url' => $profile->getUrl(),
+ 'time' => $profile->getTime(),
);
if (false === file_put_contents($file, serialize($data))) {
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
index 453a9a80c384f2e3240fde264876abeb3b4fe908..16b8b2f0604404f8fa8d508c4c889b367b45db1e 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
@@ -86,13 +86,13 @@ public function write(Profile $profile)
{
$db = $this->initDb();
$args = array(
- ':token' => $profile->getToken(),
- ':parent' => $profile->getParentToken(),
- ':data' => base64_encode(serialize($profile->getCollectors())),
- ':ip' => $profile->getIp(),
- ':method' => $profile->getMethod(),
- ':url' => $profile->getUrl(),
- ':time' => $profile->getTime(),
+ ':token' => $profile->getToken(),
+ ':parent' => $profile->getParentToken(),
+ ':data' => base64_encode(serialize($profile->getCollectors())),
+ ':ip' => $profile->getIp(),
+ ':method' => $profile->getMethod(),
+ ':url' => $profile->getUrl(),
+ ':time' => $profile->getTime(),
':created_at' => time(),
);
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
index d56e49dbae76c75f8f894680426ec079ef8afc3b..e673986d65bd89611e7932fc6415108ff64454c8 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
@@ -88,11 +88,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
}
$result[] = array(
- 'token' => $itemToken,
- 'ip' => $itemIp,
+ 'token' => $itemToken,
+ 'ip' => $itemIp,
'method' => $itemMethod,
- 'url' => $itemUrl,
- 'time' => $itemTime,
+ 'url' => $itemUrl,
+ 'time' => $itemTime,
'parent' => $itemParent,
);
--$limit;
@@ -158,14 +158,14 @@ public function read($token)
public function write(Profile $profile)
{
$data = array(
- 'token' => $profile->getToken(),
- 'parent' => $profile->getParentToken(),
+ 'token' => $profile->getToken(),
+ 'parent' => $profile->getParentToken(),
'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
- 'data' => $profile->getCollectors(),
- 'ip' => $profile->getIp(),
- 'method' => $profile->getMethod(),
- 'url' => $profile->getUrl(),
- 'time' => $profile->getTime(),
+ 'data' => $profile->getCollectors(),
+ 'ip' => $profile->getIp(),
+ 'method' => $profile->getMethod(),
+ 'url' => $profile->getUrl(),
+ 'time' => $profile->getTime(),
);
$profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md
index 7aa0656b3afb70c1c69b3266689bab236d9b0e60..8c3c32c2449c00a5a4c4994398d26339358d5997 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md
@@ -7,17 +7,19 @@ frameworks.
``HttpKernelInterface`` is the core interface of the Symfony2 full-stack
framework:
- interface HttpKernelInterface
- {
- /**
- * Handles a Request to convert it to a Response.
- *
- * @param Request $request A Request instance
- *
- * @return Response A Response instance
- */
- function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
- }
+```php
+interface HttpKernelInterface
+{
+ /**
+ * Handles a Request to convert it to a Response.
+ *
+ * @param Request $request A Request instance
+ *
+ * @return Response A Response instance
+ */
+ function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
+}
+```
It takes a ``Request`` as an input and should return a ``Response`` as an
output. Using this interface makes your code compatible with all frameworks
@@ -27,28 +29,30 @@ free.
Creating a framework based on the Symfony2 components is really easy. Here is
a very simple, but fully-featured framework based on the Symfony2 components:
- $routes = new RouteCollection();
- $routes->add('hello', new Route('/hello', array('_controller' =>
- function (Request $request) {
- return new Response(sprintf("Hello %s", $request->get('name')));
- }
- )));
+```php
+$routes = new RouteCollection();
+$routes->add('hello', new Route('/hello', array('_controller' =>
+ function (Request $request) {
+ return new Response(sprintf("Hello %s", $request->get('name')));
+ }
+)));
- $request = Request::createFromGlobals();
+$request = Request::createFromGlobals();
- $context = new RequestContext();
- $context->fromRequest($request);
+$context = new RequestContext();
+$context->fromRequest($request);
- $matcher = new UrlMatcher($routes, $context);
+$matcher = new UrlMatcher($routes, $context);
- $dispatcher = new EventDispatcher();
- $dispatcher->addSubscriber(new RouterListener($matcher));
+$dispatcher = new EventDispatcher();
+$dispatcher->addSubscriber(new RouterListener($matcher));
- $resolver = new ControllerResolver();
+$resolver = new ControllerResolver();
- $kernel = new HttpKernel($dispatcher, $resolver);
+$kernel = new HttpKernel($dispatcher, $resolver);
- $kernel->handle($request)->send();
+$kernel->handle($request)->send();
+```
This is all you need to create a flexible framework with the Symfony2
components.
@@ -56,24 +60,30 @@ components.
Want to add an HTTP reverse proxy and benefit from HTTP caching and Edge Side
Includes?
- $kernel = new HttpKernel($dispatcher, $resolver);
+```php
+$kernel = new HttpKernel($dispatcher, $resolver);
- $kernel = new HttpCache($kernel, new Store(__DIR__.'/cache'));
+$kernel = new HttpCache($kernel, new Store(__DIR__.'/cache'));
+```
Want to functional test this small framework?
- $client = new Client($kernel);
- $crawler = $client->request('GET', '/hello/Fabien');
+```php
+$client = new Client($kernel);
+$crawler = $client->request('GET', '/hello/Fabien');
- $this->assertEquals('Fabien', $crawler->filter('p > span')->text());
+$this->assertEquals('Fabien', $crawler->filter('p > span')->text());
+```
Want nice error pages instead of ugly PHP exceptions?
- $dispatcher->addSubscriber(new ExceptionListener(function (Request $request) {
- $msg = 'Something went wrong! ('.$request->get('exception')->getMessage().')';
+```php
+$dispatcher->addSubscriber(new ExceptionListener(function (Request $request) {
+ $msg = 'Something went wrong! ('.$request->get('exception')->getMessage().')';
- return new Response($msg, 500);
- }));
+ return new Response($msg, 500);
+}));
+```
And that's why the simple looking ``HttpKernelInterface`` is so powerful. It
gives you access to a lot of cool features, ready to be used out of the box,
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
index 0631ab660eb59ae05fca1c48ab541e1fa50bf867..ed769d24219eb9588661148d2d83176eb9c6d832 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -11,8 +11,8 @@
namespace Symfony\Component\HttpKernel\Tests\Controller;
+use Psr\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Controller\ControllerResolver;
-use Symfony\Component\HttpKernel\Tests\Logger;
use Symfony\Component\HttpFoundation\Request;
class ControllerResolverTest extends \PHPUnit_Framework_TestCase
@@ -21,7 +21,7 @@ public function testGetControllerWithoutControllerParameter()
{
$logger = $this->getMock('Psr\Log\LoggerInterface');
$logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing');
- $resolver = new ControllerResolver($logger);
+ $resolver = $this->createControllerResolver($logger);
$request = Request::create('/');
$this->assertFalse($resolver->getController($request), '->getController() returns false when the request has no _controller attribute');
@@ -29,7 +29,7 @@ public function testGetControllerWithoutControllerParameter()
public function testGetControllerWithLambda()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', $lambda = function () {});
@@ -39,7 +39,7 @@ public function testGetControllerWithLambda()
public function testGetControllerWithObjectAndInvokeMethod()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', $this);
@@ -49,7 +49,7 @@ public function testGetControllerWithObjectAndInvokeMethod()
public function testGetControllerWithObjectAndMethod()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', array($this, 'controllerMethod1'));
@@ -59,7 +59,7 @@ public function testGetControllerWithObjectAndMethod()
public function testGetControllerWithClassAndMethod()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'));
@@ -69,7 +69,7 @@ public function testGetControllerWithClassAndMethod()
public function testGetControllerWithObjectAndMethodAsString()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::controllerMethod1');
@@ -79,7 +79,7 @@ public function testGetControllerWithObjectAndMethodAsString()
public function testGetControllerWithClassAndInvokeMethod()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest');
@@ -92,7 +92,7 @@ public function testGetControllerWithClassAndInvokeMethod()
*/
public function testGetControllerOnObjectWithoutInvokeMethod()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', new \stdClass());
@@ -101,7 +101,7 @@ public function testGetControllerOnObjectWithoutInvokeMethod()
public function testGetControllerWithFunction()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\some_controller_function');
@@ -115,7 +115,7 @@ public function testGetControllerWithFunction()
*/
public function testGetControllerOnNonUndefinedFunction($controller)
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', $controller);
@@ -134,7 +134,7 @@ public function getUndefinedControllers()
public function testGetArguments()
{
- $resolver = new ControllerResolver();
+ $resolver = $this->createControllerResolver();
$request = Request::create('/');
$controller = array(new self(), 'testGetArguments');
@@ -207,6 +207,11 @@ public function testCreateControllerCanReturnAnyCallable()
$mock->getController($request);
}
+ protected function createControllerResolver(LoggerInterface $logger = null)
+ {
+ return new ControllerResolver($logger);
+ }
+
public function __invoke($foo, $bar = null)
{
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d5387ee5bd2e67695e0dc382fc73fbad6768d2b
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
@@ -0,0 +1,70 @@
+<?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\HttpKernel\Tests\DataCollector;
+
+use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
+use Symfony\Component\VarDumper\Cloner\Data;
+
+/**
+ * DumpDataCollectorTest
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DumpDataCollectorTest extends \PHPUnit_Framework_TestCase
+{
+ public function testDump()
+ {
+ $data = new Data(array(array(123)));
+
+ $collector = new DumpDataCollector();
+
+ $this->assertSame('dump', $collector->getName());
+
+ $collector->dump($data); $line = __LINE__;
+ $this->assertSame(1, $collector->getDumpsCount());
+
+ $dump = $collector->getDumps('html');
+ $this->assertTrue(isset($dump[0]['data']));
+ $dump[0]['data'] = preg_replace('/^.*?<pre/', '<pre', $dump[0]['data']);
+ $dump[0]['data'] = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump[0]['data']);
+
+ $xDump = array(
+ array(
+ 'data' => "<pre class=sf-dump id=sf-dump data-indent-pad=\" \"><span class=sf-dump-num>123</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n",
+ 'name' => 'DumpDataCollectorTest.php',
+ 'file' => __FILE__,
+ 'line' => $line,
+ 'fileExcerpt' => false,
+ ),
+ );
+ $this->assertSame($xDump, $dump);
+
+ $this->assertStringStartsWith(
+ 'a:1:{i:0;a:5:{s:4:"data";O:39:"Symfony\Component\VarDumper\Cloner\Data":4:{s:45:"Symfony\Component\VarDumper\Cloner\Datadata";a:1:{i:0;a:1:{i:0;i:123;}}s:49:"Symfony\Component\VarDumper\Cloner\DatamaxDepth";i:-1;s:57:"Symfony\Component\VarDumper\Cloner\DatamaxItemsPerDepth";i:-1;s:54:"Symfony\Component\VarDumper\Cloner\DatauseRefHandles";i:-1;}s:4:"name";s:25:"DumpDataCollectorTest.php";s:4:"file";s:',
+ str_replace("\0", '', $collector->serialize())
+ );
+
+ $this->assertSame(0, $collector->getDumpsCount());
+ $this->assertSame('a:0:{}', $collector->serialize());
+ }
+
+ public function testFlush()
+ {
+ $data = new Data(array(array(456)));
+ $collector = new DumpDataCollector();
+ $collector->dump($data); $line = __LINE__;
+
+ ob_start();
+ $collector = null;
+ $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
index cdb06af9ffbbb024d5fb7c330a4926a0e8a6e4d3..86d88125305a5c93c6b66fa5a9100eaeaa7d4811 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\HttpKernel\Tests\DataCollector;
use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
-use Symfony\Component\HttpKernel\Debug\ErrorHandler;
class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
{
@@ -66,14 +65,20 @@ public function getCollectTestData()
array(
1,
array(
- array('message' => 'foo', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION), 'priority' => 100, 'priorityName' => 'DEBUG'),
- array('message' => 'foo2', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION), 'priority' => 100, 'priorityName' => 'DEBUG'),
- array('message' => 'foo3', 'context' => array('type' => E_USER_WARNING, 'scream' => 0), 'priority' => 100, 'priorityName' => 'DEBUG'),
+ array('message' => 'foo', 'context' => array('type' => E_DEPRECATED, 'level' => E_ALL), 'priority' => 100, 'priorityName' => 'DEBUG'),
+ array('message' => 'foo2', 'context' => array('type' => E_USER_DEPRECATED, 'level' => E_ALL), 'priority' => 100, 'priorityName' => 'DEBUG'),
),
null,
2,
+ 0,
+ array(100 => array('count' => 2, 'name' => 'DEBUG')),
+ ),
+ array(
+ 1,
+ array(array('message' => 'foo3', 'context' => array('type' => E_USER_WARNING, 'level' => 0), 'priority' => 100, 'priorityName' => 'DEBUG')),
+ array(array('message' => 'foo3', 'context' => array('type' => E_USER_WARNING, 'level' => 0, 'scream' => true), 'priority' => 100, 'priorityName' => 'DEBUG')),
+ 0,
1,
- array(100 => array('count' => 3, 'name' => 'DEBUG')),
),
);
}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..8d3ddb4e5ddf79078c99760c540756a8f22e70c7
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php
@@ -0,0 +1,43 @@
+<?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\HttpKernel\Tests\DataCollector\Util;
+
+use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+
+class ValueExporterTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var ValueExporter
+ */
+ private $valueExporter;
+
+ protected function setUp()
+ {
+ $this->valueExporter = new ValueExporter();
+ }
+
+ public function testDateTime()
+ {
+ $dateTime = new \DateTime('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
+ $this->assertSame('Object(DateTime) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));
+ }
+
+ public function testDateTimeImmutable()
+ {
+ if (!class_exists('DateTimeImmutable', false)) {
+ $this->markTestSkipped('Test skipped, class DateTimeImmutable does not exist.');
+ }
+
+ $dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
+ $this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
index 0df6a454b6602024d35f1e1d8fdbcc795845fd57..3426f6f9a2497f67db12330085f689eda844ee19 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
@@ -17,7 +17,10 @@ class MergeExtensionConfigurationPassTest extends \PHPUnit_Framework_TestCase
{
public function testAutoloadMainExtension()
{
- $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerBuilder');
+ $container = $this->getMock(
+ 'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
+ array('getExtensionConfig', 'loadFromExtension', 'getParameterBag')
+ );
$params = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag');
$container->expects($this->at(0))
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3cd05e239dd3d3c6cf6c651fdc9aa97bf37eea5
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -0,0 +1,106 @@
+<?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\HttpKernel\Tests\EventListener;
+
+use Psr\Log\LogLevel;
+use Symfony\Component\Console\Event\ConsoleEvent;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\EventListener\DebugHandlersListener;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * DebugHandlersListenerTest
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DebugHandlersListenerTest extends \PHPUnit_Framework_TestCase
+{
+ public function testConfigure()
+ {
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $userHandler = function () {};
+ $listener = new DebugHandlersListener($userHandler, $logger);
+ $xHandler = new ExceptionHandler();
+ $eHandler = new ErrorHandler();
+ $eHandler->setExceptionHandler(array($xHandler, 'handle'));
+
+ $exception = null;
+ set_error_handler(array($eHandler, 'handleError'));
+ set_exception_handler(array($eHandler, 'handleException'));
+ try {
+ $listener->configure();
+ } catch (\Exception $exception) {
+ }
+ restore_exception_handler();
+ restore_error_handler();
+
+ if (null !== $exception) {
+ throw $exception;
+ }
+
+ $this->assertSame($userHandler, $xHandler->setHandler('var_dump'));
+
+ $loggers = $eHandler->setLoggers(array());
+
+ $this->assertArrayHasKey(E_DEPRECATED, $loggers);
+ $this->assertSame(array($logger, LogLevel::INFO), $loggers[E_DEPRECATED]);
+ }
+
+ public function testConsoleEvent()
+ {
+ $dispatcher = new EventDispatcher();
+ $listener = new DebugHandlersListener(null);
+ $app = $this->getMock('Symfony\Component\Console\Application');
+ $app->expects($this->once())->method('getHelperSet')->will($this->returnValue(new HelperSet()));
+ $command = new Command(__FUNCTION__);
+ $command->setApplication($app);
+ $event = new ConsoleEvent($command, new ArgvInput(), new ConsoleOutput());
+
+ $dispatcher->addSubscriber($listener);
+
+ $xListeners = array(
+ KernelEvents::REQUEST => array(array($listener, 'configure')),
+ ConsoleEvents::COMMAND => array(array($listener, 'configure')),
+ );
+ $this->assertSame($xListeners, $dispatcher->getListeners());
+
+ $exception = null;
+ $eHandler = new ErrorHandler();
+ set_error_handler(array($eHandler, 'handleError'));
+ set_exception_handler(array($eHandler, 'handleException'));
+ try {
+ $dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
+ } catch (\Exception $exception) {
+ }
+ restore_exception_handler();
+ restore_error_handler();
+
+ if (null !== $exception) {
+ throw $exception;
+ }
+
+ $xHandler = $eHandler->setExceptionHandler('var_dump');
+ $this->assertInstanceOf('Closure', $xHandler);
+
+ $app->expects($this->once())
+ ->method('renderException');
+
+ $xHandler(new \Exception());
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c665df563de609f851fcaf0a6f947f9ab6aa54b2
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
@@ -0,0 +1,98 @@
+<?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\HttpKernel\Tests\EventListener;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\HttpKernel\EventListener\DumpListener;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\VarDumper\VarDumper;
+
+/**
+ * DumpListenerTest
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DumpListenerTest extends \PHPUnit_Framework_TestCase
+{
+ public function testSubscribedEvents()
+ {
+ $this->assertSame(
+ array(KernelEvents::REQUEST => array('configure', 1024)),
+ DumpListener::getSubscribedEvents()
+ );
+ }
+
+ public function testConfigure()
+ {
+ $prevDumper = $this->getDumpHandler();
+
+ $container = new ContainerBuilder();
+ $container->setDefinition('var_dumper.cloner', new Definition('Symfony\Component\HttpKernel\Tests\EventListener\MockCloner'));
+ $container->setDefinition('mock_dumper', new Definition('Symfony\Component\HttpKernel\Tests\EventListener\MockDumper'));
+
+ ob_start();
+ $exception = null;
+ $listener = new DumpListener($container, 'mock_dumper');
+
+ try {
+ $listener->configure();
+
+ $lazyDumper = $this->getDumpHandler();
+ VarDumper::dump('foo');
+
+ $loadedDumper = $this->getDumpHandler();
+ VarDumper::dump('bar');
+
+ $this->assertSame('+foo-+bar-', ob_get_clean());
+
+ $listenerReflector = new \ReflectionClass($listener);
+ $lazyReflector = new \ReflectionFunction($lazyDumper);
+ $loadedReflector = new \ReflectionFunction($loadedDumper);
+
+ $this->assertSame($listenerReflector->getFilename(), $lazyReflector->getFilename());
+ $this->assertSame($listenerReflector->getFilename(), $loadedReflector->getFilename());
+ $this->assertGreaterThan($lazyReflector->getStartLine(), $loadedReflector->getStartLine());
+ } catch (\Exception $exception) {
+ }
+
+ VarDumper::setHandler($prevDumper);
+
+ if (null !== $exception) {
+ throw $exception;
+ }
+ }
+
+ private function getDumpHandler()
+ {
+ $prevDumper = VarDumper::setHandler('var_dump');
+ VarDumper::setHandler($prevDumper );
+
+ return $prevDumper;
+ }
+}
+
+class MockCloner
+{
+ public function cloneVar($var)
+ {
+ return $var.'-';
+ }
+}
+
+class MockDumper
+{
+ public function dump($var)
+ {
+ echo '+'.$var;
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/EsiListenerTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/EsiListenerTest.php
index 56f68535f1e2147e17d18b7a33f399150be6f510..9b0517d03e721cd167c3b4bcea19b1971dbd943d 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/EsiListenerTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/EsiListenerTest.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\EventListener;
use Symfony\Component\HttpKernel\HttpCache\Esi;
-use Symfony\Component\HttpKernel\EventListener\EsiListener;
+use Symfony\Component\HttpKernel\EventListener\SurrogateListener;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -27,7 +27,7 @@ public function testFilterDoesNothingForSubRequests()
$dispatcher = new EventDispatcher();
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
$response = new Response('foo <esi:include src="" />');
- $listener = new EsiListener(new Esi());
+ $listener = new SurrogateListener(new Esi());
$dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
$event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response);
@@ -41,7 +41,7 @@ public function testFilterWhenThereIsSomeEsiIncludes()
$dispatcher = new EventDispatcher();
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
$response = new Response('foo <esi:include src="" />');
- $listener = new EsiListener(new Esi());
+ $listener = new SurrogateListener(new Esi());
$dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
$event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
@@ -55,7 +55,7 @@ public function testFilterWhenThereIsNoEsiIncludes()
$dispatcher = new EventDispatcher();
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
$response = new Response('foo');
- $listener = new EsiListener(new Esi());
+ $listener = new SurrogateListener(new Esi());
$dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
$event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
index d43bbfefd19f490a7e1317e1fd5069ca2862511b..b242ede446821b463d2bceb37c707520565d32e6 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
@@ -87,7 +87,7 @@ public function testKernelTerminate()
->getMock();
$onlyException = true;
- $listener = new ProfilerListener($profiler, null, $onlyException);
+ $listener = new ProfilerListener($profiler, null, $onlyException);
// master request
$listener->onKernelRequest(new GetResponseEvent($kernel, $masterRequest, Kernel::MASTER_REQUEST));
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
index 907c20375fee65231a9d83a1c5df3758facbbc0d..cbaaf5f93a18d07a685d2f03384544f60a0598d2 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -39,7 +39,7 @@ class TestSessionListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->listener = $this->getMockForAbstractClass('Symfony\Component\HttpKernel\EventListener\TestSessionListener');
- $this->session = $this->getSession();
+ $this->session = $this->getSession();
}
public function testShouldSaveMasterRequestSession()
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c37d64786cc6d39b780360969a8792495ef0e26d
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
@@ -0,0 +1,117 @@
+<?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\HttpKernel\Tests\EventListener;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\TranslatorListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class TranslatorListenerTest extends \PHPUnit_Framework_TestCase
+{
+ private $listener;
+ private $translator;
+ private $requestStack;
+
+ protected function setUp()
+ {
+ $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
+ $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $this->listener = new TranslatorListener($this->translator, $this->requestStack);
+ }
+
+ public function testLocaleIsSetInOnKernelRequest()
+ {
+ $this->translator
+ ->expects($this->once())
+ ->method('setLocale')
+ ->with($this->equalTo('fr'));
+
+ $event = new GetResponseEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+ $this->listener->onKernelRequest($event);
+ }
+
+ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelRequest()
+ {
+ $this->translator
+ ->expects($this->at(0))
+ ->method('setLocale')
+ ->will($this->throwException(new \InvalidArgumentException()));
+ $this->translator
+ ->expects($this->at(1))
+ ->method('setLocale')
+ ->with($this->equalTo('en'));
+
+ $event = new GetResponseEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+ $this->listener->onKernelRequest($event);
+ }
+
+ public function testLocaleIsSetInOnKernelFinishRequestWhenParentRequestExists()
+ {
+ $this->translator
+ ->expects($this->once())
+ ->method('setLocale')
+ ->with($this->equalTo('fr'));
+
+ $this->setMasterRequest($this->createRequest('fr'));
+ $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+ $this->listener->onKernelFinishRequest($event);
+ }
+
+ public function testLocaleIsNotSetInOnKernelFinishRequestWhenParentRequestDoesNotExist()
+ {
+ $this->translator
+ ->expects($this->never())
+ ->method('setLocale');
+
+ $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+ $this->listener->onKernelFinishRequest($event);
+ }
+
+ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelFinishRequest()
+ {
+ $this->translator
+ ->expects($this->at(0))
+ ->method('setLocale')
+ ->will($this->throwException(new \InvalidArgumentException()));
+ $this->translator
+ ->expects($this->at(1))
+ ->method('setLocale')
+ ->with($this->equalTo('en'));
+
+ $this->setMasterRequest($this->createRequest('fr'));
+ $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+ $this->listener->onKernelFinishRequest($event);
+ }
+
+ private function createHttpKernel()
+ {
+ return $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ }
+
+ private function createRequest($locale)
+ {
+ $request = new Request();
+ $request->setLocale($locale);
+
+ return $request;
+ }
+
+ private function setMasterRequest($request)
+ {
+ $this->requestStack
+ ->expects($this->any())
+ ->method('getParentRequest')
+ ->will($this->returnValue($request));
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
index ad400c69ae3e3f5e958955853958f654bab3fcde..a90a8f1c9293deecd44f3a93a6f1efb0d42d0da8 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -23,14 +23,14 @@ public function testHasSurrogateEsiCapability()
$request = Request::create('/');
$request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
- $this->assertTrue($esi->hasSurrogateEsiCapability($request));
+ $this->assertTrue($esi->hasSurrogateCapability($request));
$request = Request::create('/');
$request->headers->set('Surrogate-Capability', 'foobar');
- $this->assertFalse($esi->hasSurrogateEsiCapability($request));
+ $this->assertFalse($esi->hasSurrogateCapability($request));
$request = Request::create('/');
- $this->assertFalse($esi->hasSurrogateEsiCapability($request));
+ $this->assertFalse($esi->hasSurrogateCapability($request));
}
public function testAddSurrogateEsiCapability()
@@ -38,10 +38,10 @@ public function testAddSurrogateEsiCapability()
$esi = new Esi();
$request = Request::create('/');
- $esi->addSurrogateEsiCapability($request);
+ $esi->addSurrogateCapability($request);
$this->assertEquals('symfony2="ESI/1.0"', $request->headers->get('Surrogate-Capability'));
- $esi->addSurrogateEsiCapability($request);
+ $esi->addSurrogateCapability($request);
$this->assertEquals('symfony2="ESI/1.0", symfony2="ESI/1.0"', $request->headers->get('Surrogate-Capability'));
}
@@ -64,10 +64,10 @@ public function testNeedsEsiParsing()
$response = new Response();
$response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
- $this->assertTrue($esi->needsEsiParsing($response));
+ $this->assertTrue($esi->needsParsing($response));
$response = new Response();
- $this->assertFalse($esi->needsEsiParsing($response));
+ $this->assertFalse($esi->needsParsing($response));
}
public function testRenderIncludeTag()
@@ -100,23 +100,23 @@ public function testProcess()
$response = new Response('foo <esi:comment text="some comment" /><esi:include src="..." alt="alt" onerror="continue" />');
$esi->process($request, $response);
- $this->assertEquals('foo <?php echo $this->esi->handle($this, \'...\', \'alt\', true) ?>'."\n", $response->getContent());
+ $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'alt\', true) ?>'."\n", $response->getContent());
$this->assertEquals('ESI', $response->headers->get('x-body-eval'));
$response = new Response('foo <esi:comment text="some comment" /><esi:include src="foo\'" alt="bar\'" onerror="continue" />');
$esi->process($request, $response);
- $this->assertEquals("foo <?php echo \$this->esi->handle(\$this, 'foo\\'', 'bar\\'', true) ?>"."\n", $response->getContent());
+ $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'foo\\\'\', \'bar\\\'\', true) ?>'."\n", $response->getContent());
$response = new Response('foo <esi:include src="..." />');
$esi->process($request, $response);
- $this->assertEquals('foo <?php echo $this->esi->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+ $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
$response = new Response('foo <esi:include src="..."></esi:include>');
$esi->process($request, $response);
- $this->assertEquals('foo <?php echo $this->esi->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+ $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
}
public function testProcessEscapesPhpTags()
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
index 974dc9ba2c3406c31668f3df1a97abbfe11eb493..7da3030edb5269dca1947af903c472d10bfbccdd 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -1047,21 +1047,21 @@ public function testEsiCacheSendsTheLowestTtl()
{
$responses = array(
array(
- 'status' => 200,
- 'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
+ 'status' => 200,
+ 'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
'headers' => array(
- 'Cache-Control' => 's-maxage=300',
+ 'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
- 'status' => 200,
- 'body' => 'Hello World!',
+ 'status' => 200,
+ 'body' => 'Hello World!',
'headers' => array('Cache-Control' => 's-maxage=300'),
),
array(
- 'status' => 200,
- 'body' => 'My name is Bobby.',
+ 'status' => 200,
+ 'body' => 'My name is Bobby.',
'headers' => array('Cache-Control' => 's-maxage=100'),
),
);
@@ -1079,21 +1079,21 @@ public function testEsiCacheForceValidation()
{
$responses = array(
array(
- 'status' => 200,
- 'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
+ 'status' => 200,
+ 'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
'headers' => array(
- 'Cache-Control' => 's-maxage=300',
+ 'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
- 'status' => 200,
- 'body' => 'Hello World!',
+ 'status' => 200,
+ 'body' => 'Hello World!',
'headers' => array('ETag' => 'foobar'),
),
array(
- 'status' => 200,
- 'body' => 'My name is Bobby.',
+ 'status' => 200,
+ 'body' => 'My name is Bobby.',
'headers' => array('Cache-Control' => 's-maxage=100'),
),
);
@@ -1112,17 +1112,17 @@ public function testEsiRecalculateContentLengthHeader()
{
$responses = array(
array(
- 'status' => 200,
- 'body' => '<esi:include src="/foo" />',
+ 'status' => 200,
+ 'body' => '<esi:include src="/foo" />',
'headers' => array(
- 'Content-Length' => 26,
- 'Cache-Control' => 's-maxage=300',
+ 'Content-Length' => 26,
+ 'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
- 'status' => 200,
- 'body' => 'Hello World!',
+ 'status' => 200,
+ 'body' => 'Hello World!',
'headers' => array(),
),
);
@@ -1203,8 +1203,8 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
$responses = array(
array(
- 'status' => 200,
- 'body' => '<esi:include src="/hey" />',
+ 'status' => 200,
+ 'body' => '<esi:include src="/hey" />',
'headers' => array(
'Surrogate-Control' => 'content="ESI/1.0"',
'ETag' => 'hey',
@@ -1212,8 +1212,8 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
),
),
array(
- 'status' => 200,
- 'body' => 'Hey!',
+ 'status' => 200,
+ 'body' => 'Hey!',
'headers' => array(),
),
);
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb208cd86c1828685e83a5de9b4fbc9f2ff0f1fb
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -0,0 +1,214 @@
+<?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\HttpKernel\Tests\HttpCache;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Ssi;
+
+class SsiTest extends \PHPUnit_Framework_TestCase
+{
+ public function testHasSurrogateSsiCapability()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $request->headers->set('Surrogate-Capability', 'abc="SSI/1.0"');
+ $this->assertTrue($ssi->hasSurrogateCapability($request));
+
+ $request = Request::create('/');
+ $request->headers->set('Surrogate-Capability', 'foobar');
+ $this->assertFalse($ssi->hasSurrogateCapability($request));
+
+ $request = Request::create('/');
+ $this->assertFalse($ssi->hasSurrogateCapability($request));
+ }
+
+ public function testAddSurrogateSsiCapability()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $ssi->addSurrogateCapability($request);
+ $this->assertEquals('symfony2="SSI/1.0"', $request->headers->get('Surrogate-Capability'));
+
+ $ssi->addSurrogateCapability($request);
+ $this->assertEquals('symfony2="SSI/1.0", symfony2="SSI/1.0"', $request->headers->get('Surrogate-Capability'));
+ }
+
+ public function testAddSurrogateControl()
+ {
+ $ssi = new Ssi();
+
+ $response = new Response('foo <!--#include virtual="" -->');
+ $ssi->addSurrogateControl($response);
+ $this->assertEquals('content="SSI/1.0"', $response->headers->get('Surrogate-Control'));
+
+ $response = new Response('foo');
+ $ssi->addSurrogateControl($response);
+ $this->assertEquals('', $response->headers->get('Surrogate-Control'));
+ }
+
+ public function testNeedsSsiParsing()
+ {
+ $ssi = new Ssi();
+
+ $response = new Response();
+ $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
+ $this->assertTrue($ssi->needsParsing($response));
+
+ $response = new Response();
+ $this->assertFalse($ssi->needsParsing($response));
+ }
+
+ public function testRenderIncludeTag()
+ {
+ $ssi = new Ssi();
+
+ $this->assertEquals('<!--#include virtual="/" -->', $ssi->renderIncludeTag('/', '/alt', true));
+ $this->assertEquals('<!--#include virtual="/" -->', $ssi->renderIncludeTag('/', '/alt', false));
+ $this->assertEquals('<!--#include virtual="/" -->', $ssi->renderIncludeTag('/'));
+ }
+
+ public function testProcessDoesNothingIfContentTypeIsNotHtml()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $response = new Response();
+ $response->headers->set('Content-Type', 'text/plain');
+ $ssi->process($request, $response);
+
+ $this->assertFalse($response->headers->has('x-body-eval'));
+ }
+
+ public function testProcess()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $response = new Response('foo <!--#include virtual="..." -->');
+ $ssi->process($request, $response);
+
+ $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+ $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+
+ $response = new Response('foo <!--#include virtual="foo\'" -->');
+ $ssi->process($request, $response);
+
+ $this->assertEquals("foo <?php echo \$this->surrogate->handle(\$this, 'foo\\'', '', false) ?>"."\n", $response->getContent());
+ }
+
+ public function testProcessEscapesPhpTags()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $response = new Response('foo <?php die("foo"); ?><%= "lala" %>');
+ $ssi->process($request, $response);
+
+ $this->assertEquals('foo <?php echo "<?"; ?>php die("foo"); ?><?php echo "<%"; ?>= "lala" %>', $response->getContent());
+ }
+
+ /**
+ * @expectedException \RuntimeException
+ */
+ public function testProcessWhenNoSrcInAnSsi()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $response = new Response('foo <!--#include -->');
+ $ssi->process($request, $response);
+ }
+
+ public function testProcessRemoveSurrogateControlHeader()
+ {
+ $ssi = new Ssi();
+
+ $request = Request::create('/');
+ $response = new Response('foo <!--#include virtual="..." -->');
+ $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
+ $ssi->process($request, $response);
+ $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+
+ $response->headers->set('Surrogate-Control', 'no-store, content="SSI/1.0"');
+ $ssi->process($request, $response);
+ $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+ $this->assertEquals('no-store', $response->headers->get('surrogate-control'));
+
+ $response->headers->set('Surrogate-Control', 'content="SSI/1.0", no-store');
+ $ssi->process($request, $response);
+ $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+ $this->assertEquals('no-store', $response->headers->get('surrogate-control'));
+ }
+
+ public function testHandle()
+ {
+ $ssi = new Ssi();
+ $cache = $this->getCache(Request::create('/'), new Response('foo'));
+ $this->assertEquals('foo', $ssi->handle($cache, '/', '/alt', true));
+ }
+
+ /**
+ * @expectedException \RuntimeException
+ */
+ public function testHandleWhenResponseIsNot200()
+ {
+ $ssi = new Ssi();
+ $response = new Response('foo');
+ $response->setStatusCode(404);
+ $cache = $this->getCache(Request::create('/'), $response);
+ $ssi->handle($cache, '/', '/alt', false);
+ }
+
+ public function testHandleWhenResponseIsNot200AndErrorsAreIgnored()
+ {
+ $ssi = new Ssi();
+ $response = new Response('foo');
+ $response->setStatusCode(404);
+ $cache = $this->getCache(Request::create('/'), $response);
+ $this->assertEquals('', $ssi->handle($cache, '/', '/alt', true));
+ }
+
+ public function testHandleWhenResponseIsNot200AndAltIsPresent()
+ {
+ $ssi = new Ssi();
+ $response1 = new Response('foo');
+ $response1->setStatusCode(404);
+ $response2 = new Response('bar');
+ $cache = $this->getCache(Request::create('/'), array($response1, $response2));
+ $this->assertEquals('bar', $ssi->handle($cache, '/', '/alt', false));
+ }
+
+ protected function getCache($request, $response)
+ {
+ $cache = $this->getMock('Symfony\Component\HttpKernel\HttpCache\HttpCache', array('getRequest', 'handle'), array(), '', false);
+ $cache->expects($this->any())
+ ->method('getRequest')
+ ->will($this->returnValue($request))
+ ;
+ if (is_array($response)) {
+ $cache->expects($this->any())
+ ->method('handle')
+ ->will(call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
+ ;
+ } else {
+ $cache->expects($this->any())
+ ->method('handle')
+ ->will($this->returnValue($response))
+ ;
+ }
+
+ return $cache;
+ }
+}
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
index 89ef406bbb15f4aed143851eb51b50ccf90caa13..773e221482bed8cd6d9136c5f0eaee16c7c48feb 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
@@ -29,9 +29,9 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
public function __construct($responses)
{
foreach ($responses as $response) {
- $this->bodies[] = $response['body'];
+ $this->bodies[] = $response['body'];
$this->statuses[] = $response['status'];
- $this->headers[] = $response['headers'];
+ $this->headers[] = $response['headers'];
}
parent::__construct(new EventDispatcher(), $this);
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php
index 4657ff1d7648b0fbe6b5687ecac253f9fb4675c0..89d7503ffad84a6d519f10a28f11d4e5dce235c1 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php
@@ -43,7 +43,7 @@ public function testChildren()
// Load them from storage
$parentProfile = $this->getStorage()->read('token_parent');
- $childProfile = $this->getStorage()->read('token_child');
+ $childProfile = $this->getStorage()->read('token_child');
// Check child has link to parent
$this->assertNotNull($childProfile->getParent());
diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json
index 43e863bd92b41a1b5c2979202d05ba508c3b0b0d..338602a2e4aa77d7724d512417fc659351322115 100644
--- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json
+++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.3",
"symfony/event-dispatcher": "~2.5",
"symfony/http-foundation": "~2.5",
- "symfony/debug": "~2.5",
+ "symfony/debug": "~2.6",
"psr/log": "~1.0"
},
"require-dev": {
@@ -33,7 +33,9 @@
"symfony/process": "~2.0",
"symfony/routing": "~2.2",
"symfony/stopwatch": "~2.2",
- "symfony/templating": "~2.2"
+ "symfony/templating": "~2.2",
+ "symfony/translation": "~2.0",
+ "symfony/var-dumper": "~2.6"
},
"suggest": {
"symfony/browser-kit": "",
@@ -41,7 +43,8 @@
"symfony/config": "",
"symfony/console": "",
"symfony/dependency-injection": "",
- "symfony/finder": ""
+ "symfony/finder": "",
+ "symfony/var-dumper": ""
},
"autoload": {
"psr-0": { "Symfony\\Component\\HttpKernel\\": "" }
@@ -50,7 +53,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/.gitignore b/core/vendor/symfony/process/Symfony/Component/Process/.gitignore
deleted file mode 100644
index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/CHANGELOG.md b/core/vendor/symfony/process/Symfony/Component/Process/CHANGELOG.md
deleted file mode 100644
index 2f3c1beb74b7e819608c4f34c36b8122c329eb1f..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/CHANGELOG.md
+++ /dev/null
@@ -1,40 +0,0 @@
-CHANGELOG
-=========
-
-2.5.0
------
-
- * added support for PTY mode
- * added the convenience method "mustRun"
- * deprecation: Process::setStdin() is deprecated in favor of Process::setInput()
- * deprecation: Process::getStdin() is deprecated in favor of Process::getInput()
- * deprecation: Process::setInput() and ProcessBuilder::setInput() do not accept non-scalar types
-
-2.4.0
------
-
- * added the ability to define an idle timeout
-
-2.3.0
------
-
- * added ProcessUtils::escapeArgument() to fix the bug in escapeshellarg() function on Windows
- * added Process::signal()
- * added Process::getPid()
- * added support for a TTY mode
-
-2.2.0
------
-
- * added ProcessBuilder::setArguments() to reset the arguments on a builder
- * added a way to retrieve the standard and error output incrementally
- * added Process:restart()
-
-2.1.0
------
-
- * added support for non-blocking processes (start(), wait(), isRunning(), stop())
- * enhanced Windows compatibility
- * added Process::getExitCodeText() that returns a string representation for
- the exit code returned by the process
- * added ProcessBuilder
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Exception/InvalidArgumentException.php b/core/vendor/symfony/process/Symfony/Component/Process/Exception/InvalidArgumentException.php
deleted file mode 100644
index 926ee2118b03703381fabcd80e01bda817c7fa67..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Process\Exception;
-
-/**
- * InvalidArgumentException for the Process Component.
- *
- * @author Romain Neutron <imprec@gmail.com>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Exception/LogicException.php b/core/vendor/symfony/process/Symfony/Component/Process/Exception/LogicException.php
deleted file mode 100644
index be3d490dde8cdea7e594b6e18bc4825a1e2eee13..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Exception/LogicException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Process\Exception;
-
-/**
- * LogicException for the Process Component.
- *
- * @author Romain Neutron <imprec@gmail.com>
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessFailedException.php b/core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessFailedException.php
deleted file mode 100644
index 7523a5e9cd4ea2c16390e0904968777941f3df02..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessFailedException.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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\Process\Exception;
-
-use Symfony\Component\Process\Process;
-
-/**
- * Exception for failed processes.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ProcessFailedException extends RuntimeException
-{
- private $process;
-
- public function __construct(Process $process)
- {
- if ($process->isSuccessful()) {
- throw new InvalidArgumentException('Expected a failed process, but the given process was successful.');
- }
-
- $error = sprintf('The command "%s" failed.'."\nExit Code: %s(%s)",
- $process->getCommandLine(),
- $process->getExitCode(),
- $process->getExitCodeText()
- );
-
- if (!$process->isOutputDisabled()) {
- $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s",
- $process->getOutput(),
- $process->getErrorOutput()
- );
- }
-
- parent::__construct($error);
-
- $this->process = $process;
- }
-
- public function getProcess()
- {
- return $this->process;
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessTimedOutException.php b/core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessTimedOutException.php
deleted file mode 100644
index d45114696f640d9a05a4eea92ce1fa1b203d2a4a..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessTimedOutException.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\Process\Exception;
-
-use Symfony\Component\Process\Process;
-
-/**
- * Exception that is thrown when a process times out.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ProcessTimedOutException extends RuntimeException
-{
- const TYPE_GENERAL = 1;
- const TYPE_IDLE = 2;
-
- private $process;
- private $timeoutType;
-
- public function __construct(Process $process, $timeoutType)
- {
- $this->process = $process;
- $this->timeoutType = $timeoutType;
-
- parent::__construct(sprintf(
- 'The process "%s" exceeded the timeout of %s seconds.',
- $process->getCommandLine(),
- $this->getExceededTimeout()
- ));
- }
-
- public function getProcess()
- {
- return $this->process;
- }
-
- public function isGeneralTimeout()
- {
- return $this->timeoutType === self::TYPE_GENERAL;
- }
-
- public function isIdleTimeout()
- {
- return $this->timeoutType === self::TYPE_IDLE;
- }
-
- public function getExceededTimeout()
- {
- switch ($this->timeoutType) {
- case self::TYPE_GENERAL:
- return $this->process->getTimeout();
-
- case self::TYPE_IDLE:
- return $this->process->getIdleTimeout();
-
- default:
- throw new \LogicException(sprintf('Unknown timeout type "%d".', $this->timeoutType));
- }
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Exception/RuntimeException.php b/core/vendor/symfony/process/Symfony/Component/Process/Exception/RuntimeException.php
deleted file mode 100644
index adead2536b10362f3e2c499612ce0ffeea3f6a49..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Process\Exception;
-
-/**
- * RuntimeException for the Process Component.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php b/core/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php
deleted file mode 100644
index 6ae74dca174b9bdb75c7edb54c69d8644f6c32a5..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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\Process;
-
-/**
- * Generic executable finder.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ExecutableFinder
-{
- private $suffixes = array('.exe', '.bat', '.cmd', '.com');
-
- /**
- * Replaces default suffixes of executable.
- *
- * @param array $suffixes
- */
- public function setSuffixes(array $suffixes)
- {
- $this->suffixes = $suffixes;
- }
-
- /**
- * Adds new possible suffix to check for executable.
- *
- * @param string $suffix
- */
- public function addSuffix($suffix)
- {
- $this->suffixes[] = $suffix;
- }
-
- /**
- * Finds an executable by name.
- *
- * @param string $name The executable name (without the extension)
- * @param string $default The default to return if no executable is found
- * @param array $extraDirs Additional dirs to check into
- *
- * @return string The executable path or default value
- */
- public function find($name, $default = null, array $extraDirs = array())
- {
- if (ini_get('open_basedir')) {
- $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));
- $dirs = array();
- foreach ($searchPath as $path) {
- if (is_dir($path)) {
- $dirs[] = $path;
- } else {
- if (basename($path) == $name && is_executable($path)) {
- return $path;
- }
- }
- }
- } else {
- $dirs = array_merge(
- explode(PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
- $extraDirs
- );
- }
-
- $suffixes = array('');
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $pathExt = getenv('PATHEXT');
- $suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;
- }
- foreach ($suffixes as $suffix) {
- foreach ($dirs as $dir) {
- if (is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && (defined('PHP_WINDOWS_VERSION_BUILD') || is_executable($file))) {
- return $file;
- }
- }
- }
-
- return $default;
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/LICENSE b/core/vendor/symfony/process/Symfony/Component/Process/LICENSE
deleted file mode 100644
index 0b3292cf9023507c2f1f93ddfee7dd8e15838048..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2014 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php b/core/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php
deleted file mode 100644
index 7854487a26b23ebaa1baf96e6660a4f7c4136d33..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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\Process;
-
-/**
- * An executable finder specifically designed for the PHP executable.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class PhpExecutableFinder
-{
- private $executableFinder;
-
- public function __construct()
- {
- $this->executableFinder = new ExecutableFinder();
- }
-
- /**
- * Finds The PHP executable.
- *
- * @param bool $includeArgs Whether or not include command arguments
- *
- * @return string|false The PHP executable path or false if it cannot be found
- */
- public function find($includeArgs = true)
- {
- // HHVM support
- if (defined('HHVM_VERSION')) {
- return (false !== ($hhvm = getenv('PHP_BINARY')) ? $hhvm : PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
- }
-
- // PHP_BINARY return the current sapi executable
- if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server')) && is_file(PHP_BINARY)) {
- return PHP_BINARY;
- }
-
- if ($php = getenv('PHP_PATH')) {
- if (!is_executable($php)) {
- return false;
- }
-
- return $php;
- }
-
- if ($php = getenv('PHP_PEAR_PHP_BIN')) {
- if (is_executable($php)) {
- return $php;
- }
- }
-
- $dirs = array(PHP_BINDIR);
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $dirs[] = 'C:\xampp\php\\';
- }
-
- return $this->executableFinder->find('php', false, $dirs);
- }
-
- /**
- * Finds the PHP executable arguments.
- *
- * @return array The PHP executable arguments
- */
- public function findArguments()
- {
- $arguments = array();
-
- // HHVM support
- if (defined('HHVM_VERSION')) {
- $arguments[] = '--php';
- }
-
- return $arguments;
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/PhpProcess.php b/core/vendor/symfony/process/Symfony/Component/Process/PhpProcess.php
deleted file mode 100644
index 93948e1db01b1ab7d602ddc6a9f58c9c28992413..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/PhpProcess.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Process;
-
-use Symfony\Component\Process\Exception\RuntimeException;
-
-/**
- * PhpProcess runs a PHP script in an independent process.
- *
- * $p = new PhpProcess('<?php echo "foo"; ?>');
- * $p->run();
- * print $p->getOutput()."\n";
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-class PhpProcess extends Process
-{
- private $executableFinder;
-
- /**
- * Constructor.
- *
- * @param string $script The PHP script to run (as a string)
- * @param string $cwd The working directory
- * @param array $env The environment variables
- * @param int $timeout The timeout in seconds
- * @param array $options An array of options for proc_open
- *
- * @api
- */
- public function __construct($script, $cwd = null, array $env = array(), $timeout = 60, array $options = array())
- {
- parent::__construct(null, $cwd, $env, $script, $timeout, $options);
-
- $this->executableFinder = new PhpExecutableFinder();
- }
-
- /**
- * Sets the path to the PHP binary to use.
- *
- * @api
- */
- public function setPhpBinary($php)
- {
- $this->setCommandLine($php);
- }
-
- /**
- * {@inheritdoc}
- */
- public function start($callback = null)
- {
- if (null === $this->getCommandLine()) {
- if (false === $php = $this->executableFinder->find()) {
- throw new RuntimeException('Unable to find the PHP executable.');
- }
- $this->setCommandLine($php);
- }
-
- parent::start($callback);
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Process.php b/core/vendor/symfony/process/Symfony/Component/Process/Process.php
deleted file mode 100644
index 7503dadefc2cdf8f4ec770303345f90768780cca..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Process.php
+++ /dev/null
@@ -1,1509 +0,0 @@
-<?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\Process;
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-use Symfony\Component\Process\Exception\LogicException;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Exception\ProcessTimedOutException;
-use Symfony\Component\Process\Exception\RuntimeException;
-
-/**
- * Process is a thin wrapper around proc_* functions to easily
- * start independent PHP processes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-class Process
-{
- const ERR = 'err';
- const OUT = 'out';
-
- const STATUS_READY = 'ready';
- const STATUS_STARTED = 'started';
- const STATUS_TERMINATED = 'terminated';
-
- const STDIN = 0;
- const STDOUT = 1;
- const STDERR = 2;
-
- // Timeout Precision in seconds.
- const TIMEOUT_PRECISION = 0.2;
-
- private $callback;
- private $commandline;
- private $cwd;
- private $env;
- private $input;
- private $starttime;
- private $lastOutputTime;
- private $timeout;
- private $idleTimeout;
- private $options;
- private $exitcode;
- private $fallbackExitcode;
- private $processInformation;
- private $outputDisabled = false;
- private $stdout;
- private $stderr;
- private $enhanceWindowsCompatibility = true;
- private $enhanceSigchildCompatibility;
- private $process;
- private $status = self::STATUS_READY;
- private $incrementalOutputOffset = 0;
- private $incrementalErrorOutputOffset = 0;
- private $tty;
- private $pty;
-
- private $useFileHandles = false;
- /** @var ProcessPipes */
- private $processPipes;
-
- private $latestSignal;
-
- private static $sigchild;
-
- /**
- * Exit codes translation table.
- *
- * User-defined errors must use exit codes in the 64-113 range.
- *
- * @var array
- */
- public static $exitCodes = array(
- 0 => 'OK',
- 1 => 'General error',
- 2 => 'Misuse of shell builtins',
-
- 126 => 'Invoked command cannot execute',
- 127 => 'Command not found',
- 128 => 'Invalid exit argument',
-
- // signals
- 129 => 'Hangup',
- 130 => 'Interrupt',
- 131 => 'Quit and dump core',
- 132 => 'Illegal instruction',
- 133 => 'Trace/breakpoint trap',
- 134 => 'Process aborted',
- 135 => 'Bus error: "access to undefined portion of memory object"',
- 136 => 'Floating point exception: "erroneous arithmetic operation"',
- 137 => 'Kill (terminate immediately)',
- 138 => 'User-defined 1',
- 139 => 'Segmentation violation',
- 140 => 'User-defined 2',
- 141 => 'Write to pipe with no one reading',
- 142 => 'Signal raised by alarm',
- 143 => 'Termination (request to terminate)',
- // 144 - not defined
- 145 => 'Child process terminated, stopped (or continued*)',
- 146 => 'Continue if stopped',
- 147 => 'Stop executing temporarily',
- 148 => 'Terminal stop signal',
- 149 => 'Background process attempting to read from tty ("in")',
- 150 => 'Background process attempting to write to tty ("out")',
- 151 => 'Urgent data available on socket',
- 152 => 'CPU time limit exceeded',
- 153 => 'File size limit exceeded',
- 154 => 'Signal raised by timer counting virtual time: "virtual timer expired"',
- 155 => 'Profiling timer expired',
- // 156 - not defined
- 157 => 'Pollable event',
- // 158 - not defined
- 159 => 'Bad syscall',
- );
-
- /**
- * Constructor.
- *
- * @param string $commandline The command line to run
- * @param string|null $cwd The working directory or null to use the working dir of the current PHP process
- * @param array|null $env The environment variables or null to inherit
- * @param string|null $input The input
- * @param int|float|null $timeout The timeout in seconds or null to disable
- * @param array $options An array of options for proc_open
- *
- * @throws RuntimeException When proc_open is not installed
- *
- * @api
- */
- public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
- {
- if (!function_exists('proc_open')) {
- throw new RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');
- }
-
- $this->commandline = $commandline;
- $this->cwd = $cwd;
-
- // on Windows, if the cwd changed via chdir(), proc_open defaults to the dir where PHP was started
- // on Gnu/Linux, PHP builds with --enable-maintainer-zts are also affected
- // @see : https://bugs.php.net/bug.php?id=51800
- // @see : https://bugs.php.net/bug.php?id=50524
- if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || defined('PHP_WINDOWS_VERSION_BUILD'))) {
- $this->cwd = getcwd();
- }
- if (null !== $env) {
- $this->setEnv($env);
- }
-
- $this->input = $input;
- $this->setTimeout($timeout);
- $this->useFileHandles = defined('PHP_WINDOWS_VERSION_BUILD');
- $this->pty = false;
- $this->enhanceWindowsCompatibility = true;
- $this->enhanceSigchildCompatibility = !defined('PHP_WINDOWS_VERSION_BUILD') && $this->isSigchildEnabled();
- $this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options);
- }
-
- public function __destruct()
- {
- // stop() will check if we have a process running.
- $this->stop();
- }
-
- public function __clone()
- {
- $this->resetProcessData();
- }
-
- /**
- * Runs the process.
- *
- * The callback receives the type of output (out or err) and
- * some bytes from the output in real-time. It allows to have feedback
- * from the independent process during execution.
- *
- * The STDOUT and STDERR are also available after the process is finished
- * via the getOutput() and getErrorOutput() methods.
- *
- * @param callable|null $callback A PHP callback to run whenever there is some
- * output available on STDOUT or STDERR
- *
- * @return int The exit status code
- *
- * @throws RuntimeException When process can't be launched
- * @throws RuntimeException When process stopped after receiving signal
- * @throws LogicException In case a callback is provided and output has been disabled
- *
- * @api
- */
- public function run($callback = null)
- {
- $this->start($callback);
-
- return $this->wait();
- }
-
- /**
- * Runs the process.
- *
- * This is identical to run() except that an exception is thrown if the process
- * exits with a non-zero exit code.
- *
- * @param callable|null $callback
- *
- * @return self
- *
- * @throws RuntimeException if PHP was compiled with --enable-sigchild and the enhanced sigchild compatibility mode is not enabled
- * @throws ProcessFailedException if the process didn't terminate successfully
- */
- public function mustRun($callback = null)
- {
- if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
- throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
- }
-
- if (0 !== $this->run($callback)) {
- throw new ProcessFailedException($this);
- }
-
- return $this;
- }
-
- /**
- * Starts the process and returns after writing the input to STDIN.
- *
- * This method blocks until all STDIN data is sent to the process then it
- * returns while the process runs in the background.
- *
- * The termination of the process can be awaited with wait().
- *
- * The callback receives the type of output (out or err) and some bytes from
- * the output in real-time while writing the standard input to the process.
- * It allows to have feedback from the independent process during execution.
- * If there is no callback passed, the wait() method can be called
- * with true as a second parameter then the callback will get all data occurred
- * in (and since) the start call.
- *
- * @param callable|null $callback A PHP callback to run whenever there is some
- * output available on STDOUT or STDERR
- *
- * @return Process The process itself
- *
- * @throws RuntimeException When process can't be launched
- * @throws RuntimeException When process is already running
- * @throws LogicException In case a callback is provided and output has been disabled
- */
- public function start($callback = null)
- {
- if ($this->isRunning()) {
- throw new RuntimeException('Process is already running');
- }
- if ($this->outputDisabled && null !== $callback) {
- throw new LogicException('Output has been disabled, enable it to allow the use of a callback.');
- }
-
- $this->resetProcessData();
- $this->starttime = $this->lastOutputTime = microtime(true);
- $this->callback = $this->buildCallback($callback);
- $descriptors = $this->getDescriptors();
-
- $commandline = $this->commandline;
-
- if (defined('PHP_WINDOWS_VERSION_BUILD') && $this->enhanceWindowsCompatibility) {
- $commandline = 'cmd /V:ON /E:ON /C "('.$commandline.')';
- foreach ($this->processPipes->getFiles() as $offset => $filename) {
- $commandline .= ' '.$offset.'>'.ProcessUtils::escapeArgument($filename);
- }
- $commandline .= '"';
-
- if (!isset($this->options['bypass_shell'])) {
- $this->options['bypass_shell'] = true;
- }
- }
-
- $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
-
- if (!is_resource($this->process)) {
- throw new RuntimeException('Unable to launch a new process.');
- }
- $this->status = self::STATUS_STARTED;
-
- $this->processPipes->unblock();
-
- if ($this->tty) {
- return;
- }
-
- $this->processPipes->write(false, $this->input);
- $this->updateStatus(false);
- $this->checkTimeout();
- }
-
- /**
- * Restarts the process.
- *
- * Be warned that the process is cloned before being started.
- *
- * @param callable|null $callback A PHP callback to run whenever there is some
- * output available on STDOUT or STDERR
- *
- * @return Process The new process
- *
- * @throws RuntimeException When process can't be launched
- * @throws RuntimeException When process is already running
- *
- * @see start()
- */
- public function restart($callback = null)
- {
- if ($this->isRunning()) {
- throw new RuntimeException('Process is already running');
- }
-
- $process = clone $this;
- $process->start($callback);
-
- return $process;
- }
-
- /**
- * Waits for the process to terminate.
- *
- * The callback receives the type of output (out or err) and some bytes
- * from the output in real-time while writing the standard input to the process.
- * It allows to have feedback from the independent process during execution.
- *
- * @param callable|null $callback A valid PHP callback
- *
- * @return int The exitcode of the process
- *
- * @throws RuntimeException When process timed out
- * @throws RuntimeException When process stopped after receiving signal
- * @throws LogicException When process is not yet started
- */
- public function wait($callback = null)
- {
- $this->requireProcessIsStarted(__FUNCTION__);
-
- $this->updateStatus(false);
- if (null !== $callback) {
- $this->callback = $this->buildCallback($callback);
- }
-
- do {
- $this->checkTimeout();
- $running = defined('PHP_WINDOWS_VERSION_BUILD') ? $this->isRunning() : $this->processPipes->hasOpenHandles();
- $close = !defined('PHP_WINDOWS_VERSION_BUILD') || !$running;
- $this->readPipes(true, $close);
- } while ($running);
-
- while ($this->isRunning()) {
- usleep(1000);
- }
-
- if ($this->processInformation['signaled'] && $this->processInformation['termsig'] !== $this->latestSignal) {
- throw new RuntimeException(sprintf('The process has been signaled with signal "%s".', $this->processInformation['termsig']));
- }
-
- return $this->exitcode;
- }
-
- /**
- * Returns the Pid (process identifier), if applicable.
- *
- * @return int|null The process id if running, null otherwise
- *
- * @throws RuntimeException In case --enable-sigchild is activated
- */
- public function getPid()
- {
- if ($this->isSigchildEnabled()) {
- throw new RuntimeException('This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.');
- }
-
- $this->updateStatus(false);
-
- return $this->isRunning() ? $this->processInformation['pid'] : null;
- }
-
- /**
- * Sends a POSIX signal to the process.
- *
- * @param int $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
- *
- * @return Process
- *
- * @throws LogicException In case the process is not running
- * @throws RuntimeException In case --enable-sigchild is activated
- * @throws RuntimeException In case of failure
- */
- public function signal($signal)
- {
- $this->doSignal($signal, true);
-
- return $this;
- }
-
- /**
- * Disables fetching output and error output from the underlying process.
- *
- * @return Process
- *
- * @throws RuntimeException In case the process is already running
- * @throws LogicException if an idle timeout is set
- */
- public function disableOutput()
- {
- if ($this->isRunning()) {
- throw new RuntimeException('Disabling output while the process is running is not possible.');
- }
- if (null !== $this->idleTimeout) {
- throw new LogicException('Output can not be disabled while an idle timeout is set.');
- }
-
- $this->outputDisabled = true;
-
- return $this;
- }
-
- /**
- * Enables fetching output and error output from the underlying process.
- *
- * @return Process
- *
- * @throws RuntimeException In case the process is already running
- */
- public function enableOutput()
- {
- if ($this->isRunning()) {
- throw new RuntimeException('Enabling output while the process is running is not possible.');
- }
-
- $this->outputDisabled = false;
-
- return $this;
- }
-
- /**
- * Returns true in case the output is disabled, false otherwise.
- *
- * @return bool
- */
- public function isOutputDisabled()
- {
- return $this->outputDisabled;
- }
-
- /**
- * Returns the current output of the process (STDOUT).
- *
- * @return string The process output
- *
- * @throws LogicException in case the output has been disabled
- * @throws LogicException In case the process is not started
- *
- * @api
- */
- public function getOutput()
- {
- if ($this->outputDisabled) {
- throw new LogicException('Output has been disabled.');
- }
-
- $this->requireProcessIsStarted(__FUNCTION__);
-
- $this->readPipes(false, defined('PHP_WINDOWS_VERSION_BUILD') ? !$this->processInformation['running'] : true);
-
- return $this->stdout;
- }
-
- /**
- * Returns the output incrementally.
- *
- * In comparison with the getOutput method which always return the whole
- * output, this one returns the new output since the last call.
- *
- * @throws LogicException in case the output has been disabled
- * @throws LogicException In case the process is not started
- *
- * @return string The process output since the last call
- */
- public function getIncrementalOutput()
- {
- $this->requireProcessIsStarted(__FUNCTION__);
-
- $data = $this->getOutput();
-
- $latest = substr($data, $this->incrementalOutputOffset);
- $this->incrementalOutputOffset = strlen($data);
-
- return $latest;
- }
-
- /**
- * Clears the process output.
- *
- * @return Process
- */
- public function clearOutput()
- {
- $this->stdout = '';
- $this->incrementalOutputOffset = 0;
-
- return $this;
- }
-
- /**
- * Returns the current error output of the process (STDERR).
- *
- * @return string The process error output
- *
- * @throws LogicException in case the output has been disabled
- * @throws LogicException In case the process is not started
- *
- * @api
- */
- public function getErrorOutput()
- {
- if ($this->outputDisabled) {
- throw new LogicException('Output has been disabled.');
- }
-
- $this->requireProcessIsStarted(__FUNCTION__);
-
- $this->readPipes(false, defined('PHP_WINDOWS_VERSION_BUILD') ? !$this->processInformation['running'] : true);
-
- return $this->stderr;
- }
-
- /**
- * Returns the errorOutput incrementally.
- *
- * In comparison with the getErrorOutput method which always return the
- * whole error output, this one returns the new error output since the last
- * call.
- *
- * @throws LogicException in case the output has been disabled
- * @throws LogicException In case the process is not started
- *
- * @return string The process error output since the last call
- */
- public function getIncrementalErrorOutput()
- {
- $this->requireProcessIsStarted(__FUNCTION__);
-
- $data = $this->getErrorOutput();
-
- $latest = substr($data, $this->incrementalErrorOutputOffset);
- $this->incrementalErrorOutputOffset = strlen($data);
-
- return $latest;
- }
-
- /**
- * Clears the process output.
- *
- * @return Process
- */
- public function clearErrorOutput()
- {
- $this->stderr = '';
- $this->incrementalErrorOutputOffset = 0;
-
- return $this;
- }
-
- /**
- * Returns the exit code returned by the process.
- *
- * @return null|int The exit status code, null if the Process is not terminated
- *
- * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
- *
- * @api
- */
- public function getExitCode()
- {
- if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
- throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
- }
-
- $this->updateStatus(false);
-
- return $this->exitcode;
- }
-
- /**
- * Returns a string representation for the exit code returned by the process.
- *
- * This method relies on the Unix exit code status standardization
- * and might not be relevant for other operating systems.
- *
- * @return null|string A string representation for the exit status code, null if the Process is not terminated.
- *
- * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
- *
- * @see http://tldp.org/LDP/abs/html/exitcodes.html
- * @see http://en.wikipedia.org/wiki/Unix_signal
- */
- public function getExitCodeText()
- {
- if (null === $exitcode = $this->getExitCode()) {
- return;
- }
-
- return isset(self::$exitCodes[$exitcode]) ? self::$exitCodes[$exitcode] : 'Unknown error';
- }
-
- /**
- * Checks if the process ended successfully.
- *
- * @return bool true if the process ended successfully, false otherwise
- *
- * @api
- */
- public function isSuccessful()
- {
- return 0 === $this->getExitCode();
- }
-
- /**
- * Returns true if the child process has been terminated by an uncaught signal.
- *
- * It always returns false on Windows.
- *
- * @return bool
- *
- * @throws RuntimeException In case --enable-sigchild is activated
- * @throws LogicException In case the process is not terminated
- *
- * @api
- */
- public function hasBeenSignaled()
- {
- $this->requireProcessIsTerminated(__FUNCTION__);
-
- if ($this->isSigchildEnabled()) {
- throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
- }
-
- $this->updateStatus(false);
-
- return $this->processInformation['signaled'];
- }
-
- /**
- * Returns the number of the signal that caused the child process to terminate its execution.
- *
- * It is only meaningful if hasBeenSignaled() returns true.
- *
- * @return int
- *
- * @throws RuntimeException In case --enable-sigchild is activated
- * @throws LogicException In case the process is not terminated
- *
- * @api
- */
- public function getTermSignal()
- {
- $this->requireProcessIsTerminated(__FUNCTION__);
-
- if ($this->isSigchildEnabled()) {
- throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
- }
-
- $this->updateStatus(false);
-
- return $this->processInformation['termsig'];
- }
-
- /**
- * Returns true if the child process has been stopped by a signal.
- *
- * It always returns false on Windows.
- *
- * @return bool
- *
- * @throws LogicException In case the process is not terminated
- *
- * @api
- */
- public function hasBeenStopped()
- {
- $this->requireProcessIsTerminated(__FUNCTION__);
-
- $this->updateStatus(false);
-
- return $this->processInformation['stopped'];
- }
-
- /**
- * Returns the number of the signal that caused the child process to stop its execution.
- *
- * It is only meaningful if hasBeenStopped() returns true.
- *
- * @return int
- *
- * @throws LogicException In case the process is not terminated
- *
- * @api
- */
- public function getStopSignal()
- {
- $this->requireProcessIsTerminated(__FUNCTION__);
-
- $this->updateStatus(false);
-
- return $this->processInformation['stopsig'];
- }
-
- /**
- * Checks if the process is currently running.
- *
- * @return bool true if the process is currently running, false otherwise
- */
- public function isRunning()
- {
- if (self::STATUS_STARTED !== $this->status) {
- return false;
- }
-
- $this->updateStatus(false);
-
- return $this->processInformation['running'];
- }
-
- /**
- * Checks if the process has been started with no regard to the current state.
- *
- * @return bool true if status is ready, false otherwise
- */
- public function isStarted()
- {
- return $this->status != self::STATUS_READY;
- }
-
- /**
- * Checks if the process is terminated.
- *
- * @return bool true if process is terminated, false otherwise
- */
- public function isTerminated()
- {
- $this->updateStatus(false);
-
- return $this->status == self::STATUS_TERMINATED;
- }
-
- /**
- * Gets the process status.
- *
- * The status is one of: ready, started, terminated.
- *
- * @return string The current process status
- */
- public function getStatus()
- {
- $this->updateStatus(false);
-
- return $this->status;
- }
-
- /**
- * Stops the process.
- *
- * @param int|float $timeout The timeout in seconds
- * @param int $signal A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL
- *
- * @return int The exit-code of the process
- *
- * @throws RuntimeException if the process got signaled
- */
- public function stop($timeout = 10, $signal = null)
- {
- $timeoutMicro = microtime(true) + $timeout;
- if ($this->isRunning()) {
- if (defined('PHP_WINDOWS_VERSION_BUILD') && !$this->isSigchildEnabled()) {
- exec(sprintf("taskkill /F /T /PID %d 2>&1", $this->getPid()), $output, $exitCode);
- if ($exitCode > 0) {
- throw new RuntimeException('Unable to kill the process');
- }
- }
- // given `SIGTERM` may not be defined and that `proc_terminate` uses the constant value and not the constant itself, we use the same here
- $this->doSignal(15, false);
- do {
- usleep(1000);
- } while ($this->isRunning() && microtime(true) < $timeoutMicro);
-
- if ($this->isRunning() && !$this->isSigchildEnabled()) {
- if (null !== $signal || defined('SIGKILL')) {
- // avoid exception here :
- // process is supposed to be running, but it might have stop
- // just after this line.
- // in any case, let's silently discard the error, we can not do anything
- $this->doSignal($signal ?: SIGKILL, false);
- }
- }
- }
-
- $this->updateStatus(false);
- if ($this->processInformation['running']) {
- $this->close();
- }
-
- return $this->exitcode;
- }
-
- /**
- * Adds a line to the STDOUT stream.
- *
- * @param string $line The line to append
- */
- public function addOutput($line)
- {
- $this->lastOutputTime = microtime(true);
- $this->stdout .= $line;
- }
-
- /**
- * Adds a line to the STDERR stream.
- *
- * @param string $line The line to append
- */
- public function addErrorOutput($line)
- {
- $this->lastOutputTime = microtime(true);
- $this->stderr .= $line;
- }
-
- /**
- * Gets the command line to be executed.
- *
- * @return string The command to execute
- */
- public function getCommandLine()
- {
- return $this->commandline;
- }
-
- /**
- * Sets the command line to be executed.
- *
- * @param string $commandline The command to execute
- *
- * @return self The current Process instance
- */
- public function setCommandLine($commandline)
- {
- $this->commandline = $commandline;
-
- return $this;
- }
-
- /**
- * Gets the process timeout (max. runtime).
- *
- * @return float|null The timeout in seconds or null if it's disabled
- */
- public function getTimeout()
- {
- return $this->timeout;
- }
-
- /**
- * Gets the process idle timeout (max. time since last output).
- *
- * @return float|null The timeout in seconds or null if it's disabled
- */
- public function getIdleTimeout()
- {
- return $this->idleTimeout;
- }
-
- /**
- * Sets the process timeout (max. runtime).
- *
- * To disable the timeout, set this value to null.
- *
- * @param int|float|null $timeout The timeout in seconds
- *
- * @return self The current Process instance
- *
- * @throws InvalidArgumentException if the timeout is negative
- */
- public function setTimeout($timeout)
- {
- $this->timeout = $this->validateTimeout($timeout);
-
- return $this;
- }
-
- /**
- * Sets the process idle timeout (max. time since last output).
- *
- * To disable the timeout, set this value to null.
- *
- * @param int|float|null $timeout The timeout in seconds
- *
- * @return self The current Process instance.
- *
- * @throws LogicException if the output is disabled
- * @throws InvalidArgumentException if the timeout is negative
- */
- public function setIdleTimeout($timeout)
- {
- if (null !== $timeout && $this->outputDisabled) {
- throw new LogicException('Idle timeout can not be set while the output is disabled.');
- }
-
- $this->idleTimeout = $this->validateTimeout($timeout);
-
- return $this;
- }
-
- /**
- * Enables or disables the TTY mode.
- *
- * @param bool $tty True to enabled and false to disable
- *
- * @return self The current Process instance
- *
- * @throws RuntimeException In case the TTY mode is not supported
- */
- public function setTty($tty)
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD') && $tty) {
- throw new RuntimeException('TTY mode is not supported on Windows platform.');
- }
-
- $this->tty = (bool) $tty;
-
- return $this;
- }
-
- /**
- * Checks if the TTY mode is enabled.
- *
- * @return bool true if the TTY mode is enabled, false otherwise
- */
- public function isTty()
- {
- return $this->tty;
- }
-
- /**
- * Sets PTY mode.
- *
- * @param bool $bool
- *
- * @return self
- */
- public function setPty($bool)
- {
- $this->pty = (bool) $bool;
-
- return $this;
- }
-
- /**
- * Returns PTY state.
- *
- * @return bool
- */
- public function isPty()
- {
- return $this->pty;
- }
-
- /**
- * Gets the working directory.
- *
- * @return string|null The current working directory or null on failure
- */
- public function getWorkingDirectory()
- {
- if (null === $this->cwd) {
- // getcwd() will return false if any one of the parent directories does not have
- // the readable or search mode set, even if the current directory does
- return getcwd() ?: null;
- }
-
- return $this->cwd;
- }
-
- /**
- * Sets the current working directory.
- *
- * @param string $cwd The new working directory
- *
- * @return self The current Process instance
- */
- public function setWorkingDirectory($cwd)
- {
- $this->cwd = $cwd;
-
- return $this;
- }
-
- /**
- * Gets the environment variables.
- *
- * @return array The current environment variables
- */
- public function getEnv()
- {
- return $this->env;
- }
-
- /**
- * Sets the environment variables.
- *
- * An environment variable value should be a string.
- * If it is an array, the variable is ignored.
- *
- * That happens in PHP when 'argv' is registered into
- * the $_ENV array for instance.
- *
- * @param array $env The new environment variables
- *
- * @return self The current Process instance
- */
- public function setEnv(array $env)
- {
- // Process can not handle env values that are arrays
- $env = array_filter($env, function ($value) {
- return !is_array($value);
- });
-
- $this->env = array();
- foreach ($env as $key => $value) {
- $this->env[(binary) $key] = (binary) $value;
- }
-
- return $this;
- }
-
- /**
- * Gets the contents of STDIN.
- *
- * @return string|null The current contents
- *
- * @deprecated Deprecated since version 2.5, to be removed in 3.0.
- * This method is deprecated in favor of getInput.
- */
- public function getStdin()
- {
- return $this->getInput();
- }
-
- /**
- * Gets the Process input.
- *
- * @return null|string The Process input
- */
- public function getInput()
- {
- return $this->input;
- }
-
- /**
- * Sets the contents of STDIN.
- *
- * Deprecation: As of Symfony 2.5, this method only accepts scalar values.
- *
- * @param string|null $stdin The new contents
- *
- * @return self The current Process instance
- *
- * @deprecated Deprecated since version 2.5, to be removed in 3.0.
- * This method is deprecated in favor of setInput.
- *
- * @throws LogicException In case the process is running
- * @throws InvalidArgumentException In case the argument is invalid
- */
- public function setStdin($stdin)
- {
- return $this->setInput($stdin);
- }
-
- /**
- * Sets the input.
- *
- * This content will be passed to the underlying process standard input.
- *
- * @param string|null $input The content
- *
- * @return self The current Process instance
- *
- * @throws LogicException In case the process is running
- */
- public function setInput($input)
- {
- if ($this->isRunning()) {
- throw new LogicException('Input can not be set while the process is running.');
- }
-
- $this->input = ProcessUtils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
-
- return $this;
- }
-
- /**
- * Gets the options for proc_open.
- *
- * @return array The current options
- */
- public function getOptions()
- {
- return $this->options;
- }
-
- /**
- * Sets the options for proc_open.
- *
- * @param array $options The new options
- *
- * @return self The current Process instance
- */
- public function setOptions(array $options)
- {
- $this->options = $options;
-
- return $this;
- }
-
- /**
- * Gets whether or not Windows compatibility is enabled.
- *
- * This is true by default.
- *
- * @return bool
- */
- public function getEnhanceWindowsCompatibility()
- {
- return $this->enhanceWindowsCompatibility;
- }
-
- /**
- * Sets whether or not Windows compatibility is enabled.
- *
- * @param bool $enhance
- *
- * @return self The current Process instance
- */
- public function setEnhanceWindowsCompatibility($enhance)
- {
- $this->enhanceWindowsCompatibility = (bool) $enhance;
-
- return $this;
- }
-
- /**
- * Returns whether sigchild compatibility mode is activated or not.
- *
- * @return bool
- */
- public function getEnhanceSigchildCompatibility()
- {
- return $this->enhanceSigchildCompatibility;
- }
-
- /**
- * Activates sigchild compatibility mode.
- *
- * Sigchild compatibility mode is required to get the exit code and
- * determine the success of a process when PHP has been compiled with
- * the --enable-sigchild option
- *
- * @param bool $enhance
- *
- * @return self The current Process instance
- */
- public function setEnhanceSigchildCompatibility($enhance)
- {
- $this->enhanceSigchildCompatibility = (bool) $enhance;
-
- return $this;
- }
-
- /**
- * Performs a check between the timeout definition and the time the process started.
- *
- * In case you run a background process (with the start method), you should
- * trigger this method regularly to ensure the process timeout
- *
- * @throws ProcessTimedOutException In case the timeout was reached
- */
- public function checkTimeout()
- {
- if ($this->status !== self::STATUS_STARTED) {
- return;
- }
-
- if (null !== $this->timeout && $this->timeout < microtime(true) - $this->starttime) {
- $this->stop(0);
-
- throw new ProcessTimedOutException($this, ProcessTimedOutException::TYPE_GENERAL);
- }
-
- if (null !== $this->idleTimeout && $this->idleTimeout < microtime(true) - $this->lastOutputTime) {
- $this->stop(0);
-
- throw new ProcessTimedOutException($this, ProcessTimedOutException::TYPE_IDLE);
- }
- }
-
- /**
- * Returns whether PTY is supported on the current operating system.
- *
- * @return bool
- */
- public static function isPtySupported()
- {
- static $result;
-
- if (null !== $result) {
- return $result;
- }
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- return $result = false;
- }
-
- $proc = @proc_open('echo 1', array(array('pty'), array('pty'), array('pty')), $pipes);
- if (is_resource($proc)) {
- proc_close($proc);
-
- return $result = true;
- }
-
- return $result = false;
- }
-
- /**
- * Creates the descriptors needed by the proc_open.
- *
- * @return array
- */
- private function getDescriptors()
- {
- $this->processPipes = new ProcessPipes($this->useFileHandles, $this->tty, $this->pty, $this->outputDisabled);
- $descriptors = $this->processPipes->getDescriptors();
-
- if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
- // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
- $descriptors = array_merge($descriptors, array(array('pipe', 'w')));
-
- $this->commandline = '('.$this->commandline.') 3>/dev/null; code=$?; echo $code >&3; exit $code';
- }
-
- return $descriptors;
- }
-
- /**
- * Builds up the callback used by wait().
- *
- * The callbacks adds all occurred output to the specific buffer and calls
- * the user callback (if present) with the received output.
- *
- * @param callable|null $callback The user defined PHP callback
- *
- * @return callable A PHP callable
- */
- protected function buildCallback($callback)
- {
- $that = $this;
- $out = self::OUT;
- $err = self::ERR;
- $callback = function ($type, $data) use ($that, $callback, $out, $err) {
- if ($out == $type) {
- $that->addOutput($data);
- } else {
- $that->addErrorOutput($data);
- }
-
- if (null !== $callback) {
- call_user_func($callback, $type, $data);
- }
- };
-
- return $callback;
- }
-
- /**
- * Updates the status of the process, reads pipes.
- *
- * @param bool $blocking Whether to use a blocking read call.
- */
- protected function updateStatus($blocking)
- {
- if (self::STATUS_STARTED !== $this->status) {
- return;
- }
-
- $this->processInformation = proc_get_status($this->process);
- $this->captureExitCode();
-
- $this->readPipes($blocking, defined('PHP_WINDOWS_VERSION_BUILD') ? !$this->processInformation['running'] : true);
-
- if (!$this->processInformation['running']) {
- $this->close();
- }
- }
-
- /**
- * Returns whether PHP has been compiled with the '--enable-sigchild' option or not.
- *
- * @return bool
- */
- protected function isSigchildEnabled()
- {
- if (null !== self::$sigchild) {
- return self::$sigchild;
- }
-
- if (!function_exists('phpinfo')) {
- return self::$sigchild = false;
- }
-
- ob_start();
- phpinfo(INFO_GENERAL);
-
- return self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
- }
-
- /**
- * Validates and returns the filtered timeout.
- *
- * @param int|float|null $timeout
- *
- * @return float|null
- *
- * @throws InvalidArgumentException if the given timeout is a negative number
- */
- private function validateTimeout($timeout)
- {
- $timeout = (float) $timeout;
-
- if (0.0 === $timeout) {
- $timeout = null;
- } elseif ($timeout < 0) {
- throw new InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
- }
-
- return $timeout;
- }
-
- /**
- * Reads pipes, executes callback.
- *
- * @param bool $blocking Whether to use blocking calls or not.
- * @param bool $close Whether to close file handles or not.
- */
- private function readPipes($blocking, $close)
- {
- if ($close) {
- $result = $this->processPipes->readAndCloseHandles($blocking);
- } else {
- $result = $this->processPipes->read($blocking);
- }
-
- foreach ($result as $type => $data) {
- if (3 == $type) {
- $this->fallbackExitcode = (int) $data;
- } else {
- call_user_func($this->callback, $type === self::STDOUT ? self::OUT : self::ERR, $data);
- }
- }
- }
-
- /**
- * Captures the exitcode if mentioned in the process information.
- */
- private function captureExitCode()
- {
- if (isset($this->processInformation['exitcode']) && -1 != $this->processInformation['exitcode']) {
- $this->exitcode = $this->processInformation['exitcode'];
- }
- }
-
- /**
- * Closes process resource, closes file handles, sets the exitcode.
- *
- * @return int The exitcode
- */
- private function close()
- {
- $this->processPipes->close();
- if (is_resource($this->process)) {
- $exitcode = proc_close($this->process);
- } else {
- $exitcode = -1;
- }
-
- $this->exitcode = -1 !== $exitcode ? $exitcode : (null !== $this->exitcode ? $this->exitcode : -1);
- $this->status = self::STATUS_TERMINATED;
-
- if (-1 === $this->exitcode && null !== $this->fallbackExitcode) {
- $this->exitcode = $this->fallbackExitcode;
- } elseif (-1 === $this->exitcode && $this->processInformation['signaled'] && 0 < $this->processInformation['termsig']) {
- // if process has been signaled, no exitcode but a valid termsig, apply Unix convention
- $this->exitcode = 128 + $this->processInformation['termsig'];
- }
-
- return $this->exitcode;
- }
-
- /**
- * Resets data related to the latest run of the process.
- */
- private function resetProcessData()
- {
- $this->starttime = null;
- $this->callback = null;
- $this->exitcode = null;
- $this->fallbackExitcode = null;
- $this->processInformation = null;
- $this->stdout = null;
- $this->stderr = null;
- $this->process = null;
- $this->latestSignal = null;
- $this->status = self::STATUS_READY;
- $this->incrementalOutputOffset = 0;
- $this->incrementalErrorOutputOffset = 0;
- }
-
- /**
- * Sends a POSIX signal to the process.
- *
- * @param int $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
- * @param bool $throwException Whether to throw exception in case signal failed
- *
- * @return bool True if the signal was sent successfully, false otherwise
- *
- * @throws LogicException In case the process is not running
- * @throws RuntimeException In case --enable-sigchild is activated
- * @throws RuntimeException In case of failure
- */
- private function doSignal($signal, $throwException)
- {
- if (!$this->isRunning()) {
- if ($throwException) {
- throw new LogicException('Can not send signal on a non running process.');
- }
-
- return false;
- }
-
- if ($this->isSigchildEnabled()) {
- if ($throwException) {
- throw new RuntimeException('This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
- }
-
- return false;
- }
-
- if (true !== @proc_terminate($this->process, $signal)) {
- if ($throwException) {
- throw new RuntimeException(sprintf('Error while sending signal `%s`.', $signal));
- }
-
- return false;
- }
-
- $this->latestSignal = $signal;
-
- return true;
- }
-
- /**
- * Ensures the process is running or terminated, throws a LogicException if the process has a not started.
- *
- * @param string $functionName The function name that was called.
- *
- * @throws LogicException If the process has not run.
- */
- private function requireProcessIsStarted($functionName)
- {
- if (!$this->isStarted()) {
- throw new LogicException(sprintf('Process must be started before calling %s.', $functionName));
- }
- }
-
- /**
- * Ensures the process is terminated, throws a LogicException if the process has a status different than `terminated`.
- *
- * @param string $functionName The function name that was called.
- *
- * @throws LogicException If the process is not yet terminated.
- */
- private function requireProcessIsTerminated($functionName)
- {
- if (!$this->isTerminated()) {
- throw new LogicException(sprintf('Process must be terminated before calling %s.', $functionName));
- }
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php b/core/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
deleted file mode 100644
index 71633cd7fac3c5acf0d3d08a575a6456e33c2cf7..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?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\Process;
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-use Symfony\Component\Process\Exception\LogicException;
-
-/**
- * Process builder.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class ProcessBuilder
-{
- private $arguments;
- private $cwd;
- private $env = array();
- private $input;
- private $timeout = 60;
- private $options = array();
- private $inheritEnv = true;
- private $prefix = array();
- private $outputDisabled = false;
-
- /**
- * Constructor
- *
- * @param string[] $arguments An array of arguments
- */
- public function __construct(array $arguments = array())
- {
- $this->arguments = $arguments;
- }
-
- /**
- * Creates a process builder instance.
- *
- * @param string[] $arguments An array of arguments
- *
- * @return ProcessBuilder
- */
- public static function create(array $arguments = array())
- {
- return new static($arguments);
- }
-
- /**
- * Adds an unescaped argument to the command string.
- *
- * @param string $argument A command argument
- *
- * @return ProcessBuilder
- */
- public function add($argument)
- {
- $this->arguments[] = $argument;
-
- return $this;
- }
-
- /**
- * Adds an unescaped prefix to the command string.
- *
- * The prefix is preserved when resetting arguments.
- *
- * @param string|array $prefix A command prefix or an array of command prefixes
- *
- * @return ProcessBuilder
- */
- public function setPrefix($prefix)
- {
- $this->prefix = is_array($prefix) ? $prefix : array($prefix);
-
- return $this;
- }
-
- /**
- * Sets the arguments of the process.
- *
- * Arguments must not be escaped.
- * Previous arguments are removed.
- *
- * @param string[] $arguments
- *
- * @return ProcessBuilder
- */
- public function setArguments(array $arguments)
- {
- $this->arguments = $arguments;
-
- return $this;
- }
-
- /**
- * Sets the working directory.
- *
- * @param null|string $cwd The working directory
- *
- * @return ProcessBuilder
- */
- public function setWorkingDirectory($cwd)
- {
- $this->cwd = $cwd;
-
- return $this;
- }
-
- /**
- * Sets whether environment variables will be inherited or not.
- *
- * @param bool $inheritEnv
- *
- * @return ProcessBuilder
- */
- public function inheritEnvironmentVariables($inheritEnv = true)
- {
- $this->inheritEnv = $inheritEnv;
-
- return $this;
- }
-
- /**
- * Sets an environment variable
- *
- * Setting a variable overrides its previous value. Use `null` to unset a
- * defined environment variable.
- *
- * @param string $name The variable name
- * @param null|string $value The variable value
- *
- * @return ProcessBuilder
- */
- public function setEnv($name, $value)
- {
- $this->env[$name] = $value;
-
- return $this;
- }
-
- /**
- * Adds a set of environment variables.
- *
- * Already existing environment variables with the same name will be
- * overridden by the new values passed to this method. Pass `null` to unset
- * a variable.
- *
- * @param array $variables The variables
- *
- * @return ProcessBuilder
- */
- public function addEnvironmentVariables(array $variables)
- {
- $this->env = array_replace($this->env, $variables);
-
- return $this;
- }
-
- /**
- * Sets the input of the process.
- *
- * Deprecation: As of Symfony 2.5, this method only accepts string values.
- *
- * @param string|null $input The input as a string
- *
- * @return ProcessBuilder
- *
- * @throws InvalidArgumentException In case the argument is invalid
- */
- public function setInput($input)
- {
- $this->input = ProcessUtils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
-
- return $this;
- }
-
- /**
- * Sets the process timeout.
- *
- * To disable the timeout, set this value to null.
- *
- * @param float|null
- *
- * @return ProcessBuilder
- *
- * @throws InvalidArgumentException
- */
- public function setTimeout($timeout)
- {
- if (null === $timeout) {
- $this->timeout = null;
-
- return $this;
- }
-
- $timeout = (float) $timeout;
-
- if ($timeout < 0) {
- throw new InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
- }
-
- $this->timeout = $timeout;
-
- return $this;
- }
-
- /**
- * Adds a proc_open option.
- *
- * @param string $name The option name
- * @param string $value The option value
- *
- * @return ProcessBuilder
- */
- public function setOption($name, $value)
- {
- $this->options[$name] = $value;
-
- return $this;
- }
-
- /**
- * Disables fetching output and error output from the underlying process.
- *
- * @return ProcessBuilder
- */
- public function disableOutput()
- {
- $this->outputDisabled = true;
-
- return $this;
- }
-
- /**
- * Enables fetching output and error output from the underlying process.
- *
- * @return ProcessBuilder
- */
- public function enableOutput()
- {
- $this->outputDisabled = false;
-
- return $this;
- }
-
- /**
- * Creates a Process instance and returns it.
- *
- * @return Process
- *
- * @throws LogicException In case no arguments have been provided
- */
- public function getProcess()
- {
- if (0 === count($this->prefix) && 0 === count($this->arguments)) {
- throw new LogicException('You must add() command arguments before calling getProcess().');
- }
-
- $options = $this->options;
-
- $arguments = array_merge($this->prefix, $this->arguments);
- $script = implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $arguments));
-
- if ($this->inheritEnv) {
- // include $_ENV for BC purposes
- $env = array_replace($_ENV, $_SERVER, $this->env);
- } else {
- $env = $this->env;
- }
-
- $process = new Process($script, $this->cwd, $env, $this->input, $this->timeout, $options);
-
- if ($this->outputDisabled) {
- $process->disableOutput();
- }
-
- return $process;
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/ProcessPipes.php b/core/vendor/symfony/process/Symfony/Component/Process/ProcessPipes.php
deleted file mode 100644
index 9ed1def9f29e34c2bb7dcaa39db59651b0163a33..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/ProcessPipes.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?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\Process;
-
-use Symfony\Component\Process\Exception\RuntimeException;
-
-/**
- * ProcessPipes manages descriptors and pipes for the use of proc_open.
- */
-class ProcessPipes
-{
- /** @var array */
- public $pipes = array();
- /** @var array */
- private $files = array();
- /** @var array */
- private $fileHandles = array();
- /** @var array */
- private $readBytes = array();
- /** @var bool */
- private $useFiles;
- /** @var bool */
- private $ttyMode;
- /** @var bool */
- private $ptyMode;
- /** @var bool */
- private $disableOutput;
-
- const CHUNK_SIZE = 16384;
-
- public function __construct($useFiles, $ttyMode, $ptyMode = false, $disableOutput = false)
- {
- $this->useFiles = (bool) $useFiles;
- $this->ttyMode = (bool) $ttyMode;
- $this->ptyMode = (bool) $ptyMode;
- $this->disableOutput = (bool) $disableOutput;
-
- // Fix for PHP bug #51800: reading from STDOUT pipe hangs forever on Windows if the output is too big.
- // Workaround for this problem is to use temporary files instead of pipes on Windows platform.
- //
- // @see https://bugs.php.net/bug.php?id=51800
- if ($this->useFiles && !$this->disableOutput) {
- $this->files = array(
- Process::STDOUT => tempnam(sys_get_temp_dir(), 'sf_proc_stdout'),
- Process::STDERR => tempnam(sys_get_temp_dir(), 'sf_proc_stderr'),
- );
- foreach ($this->files as $offset => $file) {
- $this->fileHandles[$offset] = fopen($this->files[$offset], 'rb');
- if (false === $this->fileHandles[$offset]) {
- throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
- }
- }
- $this->readBytes = array(
- Process::STDOUT => 0,
- Process::STDERR => 0,
- );
- }
- }
-
- public function __destruct()
- {
- $this->close();
- $this->removeFiles();
- }
-
- /**
- * Sets non-blocking mode on pipes.
- */
- public function unblock()
- {
- foreach ($this->pipes as $pipe) {
- stream_set_blocking($pipe, 0);
- }
- }
-
- /**
- * Closes file handles and pipes.
- */
- public function close()
- {
- $this->closeUnixPipes();
- foreach ($this->fileHandles as $handle) {
- fclose($handle);
- }
- $this->fileHandles = array();
- }
-
- /**
- * Closes Unix pipes.
- *
- * Nothing happens in case file handles are used.
- */
- public function closeUnixPipes()
- {
- foreach ($this->pipes as $pipe) {
- fclose($pipe);
- }
- $this->pipes = array();
- }
-
- /**
- * Returns an array of descriptors for the use of proc_open.
- *
- * @return array
- */
- public function getDescriptors()
- {
- if ($this->disableOutput) {
- $nullstream = fopen(defined('PHP_WINDOWS_VERSION_BUILD') ? 'NUL' : '/dev/null', 'c');
-
- return array(
- array('pipe', 'r'),
- $nullstream,
- $nullstream,
- );
- }
-
- if ($this->useFiles) {
- // We're not using pipe on Windows platform as it hangs (https://bugs.php.net/bug.php?id=51800)
- // We're not using file handles as it can produce corrupted output https://bugs.php.net/bug.php?id=65650
- // So we redirect output within the commandline and pass the nul device to the process
- return array(
- array('pipe', 'r'),
- array('file', 'NUL', 'w'),
- array('file', 'NUL', 'w'),
- );
- }
-
- if ($this->ttyMode) {
- return array(
- array('file', '/dev/tty', 'r'),
- array('file', '/dev/tty', 'w'),
- array('file', '/dev/tty', 'w'),
- );
- } elseif ($this->ptyMode && Process::isPtySupported()) {
- return array(
- array('pty'),
- array('pty'),
- array('pty'),
- );
- }
-
- return array(
- array('pipe', 'r'), // stdin
- array('pipe', 'w'), // stdout
- array('pipe', 'w'), // stderr
- );
- }
-
- /**
- * Returns an array of filenames indexed by their related stream in case these pipes use temporary files.
- *
- * @return array
- */
- public function getFiles()
- {
- if ($this->useFiles) {
- return $this->files;
- }
-
- return array();
- }
-
- /**
- * Reads data in file handles and pipes.
- *
- * @param bool $blocking Whether to use blocking calls or not.
- *
- * @return array An array of read data indexed by their fd.
- */
- public function read($blocking)
- {
- return array_replace($this->readStreams($blocking), $this->readFileHandles());
- }
-
- /**
- * Reads data in file handles and pipes, closes them if EOF is reached.
- *
- * @param bool $blocking Whether to use blocking calls or not.
- *
- * @return array An array of read data indexed by their fd.
- */
- public function readAndCloseHandles($blocking)
- {
- return array_replace($this->readStreams($blocking, true), $this->readFileHandles(true));
- }
-
- /**
- * Returns if the current state has open file handles or pipes.
- *
- * @return bool
- */
- public function hasOpenHandles()
- {
- if (!$this->useFiles) {
- return (bool) $this->pipes;
- }
-
- return (bool) $this->pipes && (bool) $this->fileHandles;
- }
-
- /**
- * Writes stdin data.
- *
- * @param bool $blocking Whether to use blocking calls or not.
- * @param string|null $stdin The data to write.
- */
- public function write($blocking, $stdin)
- {
- if (null === $stdin) {
- fclose($this->pipes[0]);
- unset($this->pipes[0]);
-
- return;
- }
-
- $writePipes = array($this->pipes[0]);
- unset($this->pipes[0]);
- $stdinLen = strlen($stdin);
- $stdinOffset = 0;
-
- while ($writePipes) {
- $r = null;
- $w = $writePipes;
- $e = null;
-
- if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? ceil(Process::TIMEOUT_PRECISION * 1E6) : 0)) {
- // if a system call has been interrupted, forget about it, let's try again
- if ($this->hasSystemCallBeenInterrupted()) {
- continue;
- }
- break;
- }
-
- // nothing has changed, let's wait until the process is ready
- if (0 === $n) {
- continue;
- }
-
- if ($w) {
- $written = fwrite($writePipes[0], (binary) substr($stdin, $stdinOffset), 8192);
- if (false !== $written) {
- $stdinOffset += $written;
- }
- if ($stdinOffset >= $stdinLen) {
- fclose($writePipes[0]);
- $writePipes = null;
- }
- }
- }
- }
-
- /**
- * Reads data in file handles.
- *
- * @param bool $close Whether to close file handles or not.
- *
- * @return array An array of read data indexed by their fd.
- */
- private function readFileHandles($close = false)
- {
- $read = array();
- $fh = $this->fileHandles;
- foreach ($fh as $type => $fileHandle) {
- if (0 !== fseek($fileHandle, $this->readBytes[$type])) {
- continue;
- }
- $data = '';
- $dataread = null;
- while (!feof($fileHandle)) {
- if (false !== $dataread = fread($fileHandle, self::CHUNK_SIZE)) {
- $data .= $dataread;
- }
- }
- if (0 < $length = strlen($data)) {
- $this->readBytes[$type] += $length;
- $read[$type] = $data;
- }
-
- if (false === $dataread || (true === $close && feof($fileHandle) && '' === $data)) {
- fclose($this->fileHandles[$type]);
- unset($this->fileHandles[$type]);
- }
- }
-
- return $read;
- }
-
- /**
- * Reads data in file pipes streams.
- *
- * @param bool $blocking Whether to use blocking calls or not.
- * @param bool $close Whether to close file handles or not.
- *
- * @return array An array of read data indexed by their fd.
- */
- private function readStreams($blocking, $close = false)
- {
- if (empty($this->pipes)) {
- usleep(Process::TIMEOUT_PRECISION * 1E4);
-
- return array();
- }
-
- $read = array();
-
- $r = $this->pipes;
- $w = null;
- $e = null;
-
- // let's have a look if something changed in streams
- if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? ceil(Process::TIMEOUT_PRECISION * 1E6) : 0)) {
- // if a system call has been interrupted, forget about it, let's try again
- // otherwise, an error occurred, let's reset pipes
- if (!$this->hasSystemCallBeenInterrupted()) {
- $this->pipes = array();
- }
-
- return $read;
- }
-
- // nothing has changed
- if (0 === $n) {
- return $read;
- }
-
- foreach ($r as $pipe) {
- $type = array_search($pipe, $this->pipes);
-
- $data = '';
- while ('' !== $dataread = (string) fread($pipe, self::CHUNK_SIZE)) {
- $data .= $dataread;
- }
-
- if ('' !== $data) {
- $read[$type] = $data;
- }
-
- if (false === $data || (true === $close && feof($pipe) && '' === $data)) {
- fclose($this->pipes[$type]);
- unset($this->pipes[$type]);
- }
- }
-
- return $read;
- }
-
- /**
- * Returns true if a system call has been interrupted.
- *
- * @return bool
- */
- private function hasSystemCallBeenInterrupted()
- {
- $lastError = error_get_last();
-
- // stream_select returns false when the `select` system call is interrupted by an incoming signal
- return isset($lastError['message']) && false !== stripos($lastError['message'], 'interrupted system call');
- }
-
- /**
- * Removes temporary files
- */
- private function removeFiles()
- {
- foreach ($this->files as $filename) {
- if (file_exists($filename)) {
- @unlink($filename);
- }
- }
- $this->files = array();
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php b/core/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
deleted file mode 100644
index 35ae17c5088220b08ddef9e8d45b91ef77cc06e2..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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\Process;
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-
-/**
- * ProcessUtils is a bunch of utility methods.
- *
- * This class contains static methods only and is not meant to be instantiated.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class ProcessUtils
-{
- /**
- * This class should not be instantiated
- */
- private function __construct()
- {
- }
-
- /**
- * Escapes a string to be used as a shell argument.
- *
- * @param string $argument The argument that will be escaped
- *
- * @return string The escaped argument
- */
- public static function escapeArgument($argument)
- {
- //Fix for PHP bug #43784 escapeshellarg removes % from given string
- //Fix for PHP bug #49446 escapeshellarg doesn't work on Windows
- //@see https://bugs.php.net/bug.php?id=43784
- //@see https://bugs.php.net/bug.php?id=49446
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- if ('' === $argument) {
- return escapeshellarg($argument);
- }
-
- $escapedArgument = '';
- $quote = false;
- foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
- if ('"' === $part) {
- $escapedArgument .= '\\"';
- } elseif (self::isSurroundedBy($part, '%')) {
- // Avoid environment variable expansion
- $escapedArgument .= '^%"'.substr($part, 1, -1).'"^%';
- } else {
- // escape trailing backslash
- if ('\\' === substr($part, -1)) {
- $part .= '\\';
- }
- $quote = true;
- $escapedArgument .= $part;
- }
- }
- if ($quote) {
- $escapedArgument = '"'.$escapedArgument.'"';
- }
-
- return $escapedArgument;
- }
-
- return escapeshellarg($argument);
- }
-
- /**
- * Validates and normalizes a Process input
- *
- * @param string $caller The name of method call that validates the input
- * @param mixed $input The input to validate
- *
- * @return string The validated input
- *
- * @throws InvalidArgumentException In case the input is not valid
- */
- public static function validateInput($caller, $input)
- {
- if (null !== $input) {
- if (is_scalar($input)) {
- return (string) $input;
- }
- // deprecated as of Symfony 2.5, to be removed in 3.0
- if (is_object($input) && method_exists($input, '__toString')) {
- return (string) $input;
- }
-
- throw new InvalidArgumentException(sprintf('%s only accepts strings.', $caller));
- }
-
- return $input;
- }
-
- private static function isSurroundedBy($arg, $char)
- {
- return 2 < strlen($arg) && $char === $arg[0] && $char === $arg[strlen($arg) - 1];
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/README.md b/core/vendor/symfony/process/Symfony/Component/Process/README.md
deleted file mode 100644
index c7e21386dac845bbd611d8ddd7433c03ece5d3a4..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-Process Component
-=================
-
-Process executes commands in sub-processes.
-
-In this example, we run a simple directory listing and get the result back:
-
- use Symfony\Component\Process\Process;
-
- $process = new Process('ls -lsa');
- $process->setTimeout(3600);
- $process->run();
- if (!$process->isSuccessful()) {
- throw new RuntimeException($process->getErrorOutput());
- }
-
- print $process->getOutput();
-
-You can think that this is easy to achieve with plain PHP but it's not especially
-if you want to take care of the subtle differences between the different platforms.
-
-And if you want to be able to get some feedback in real-time, just pass an
-anonymous function to the ``run()`` method and you will get the output buffer
-as it becomes available:
-
- use Symfony\Component\Process\Process;
-
- $process = new Process('ls -lsa');
- $process->run(function ($type, $buffer) {
- if (Process::ERR === $type) {
- echo 'ERR > '.$buffer;
- } else {
- echo 'OUT > '.$buffer;
- }
- });
-
-That's great if you want to execute a long running command (like rsync-ing files to a
-remote server) and give feedback to the user in real-time.
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
- $ cd path/to/Symfony/Component/Process/
- $ composer.phar install
- $ phpunit
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
deleted file mode 100644
index c5737e1a9e38c49dfed32d8145663a50d40c36cc..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ /dev/null
@@ -1,1104 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\Exception\ProcessTimedOutException;
-use Symfony\Component\Process\Exception\LogicException;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\Exception\RuntimeException;
-use Symfony\Component\Process\ProcessPipes;
-
-/**
- * @author Robert Schönthal <seroscho@googlemail.com>
- */
-abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
-{
- public function testThatProcessDoesNotThrowWarningDuringRun()
- {
- @trigger_error('Test Error', E_USER_NOTICE);
- $process = $this->getProcess("php -r 'sleep(3)'");
- $process->run();
- $actualError = error_get_last();
- $this->assertEquals('Test Error', $actualError['message']);
- $this->assertEquals(E_USER_NOTICE, $actualError['type']);
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- */
- public function testNegativeTimeoutFromConstructor()
- {
- $this->getProcess('', null, null, null, -1);
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- */
- public function testNegativeTimeoutFromSetter()
- {
- $p = $this->getProcess('');
- $p->setTimeout(-1);
- }
-
- public function testFloatAndNullTimeout()
- {
- $p = $this->getProcess('');
-
- $p->setTimeout(10);
- $this->assertSame(10.0, $p->getTimeout());
-
- $p->setTimeout(null);
- $this->assertNull($p->getTimeout());
-
- $p->setTimeout(0.0);
- $this->assertNull($p->getTimeout());
- }
-
- public function testStopWithTimeoutIsActuallyWorking()
- {
- $this->verifyPosixIsEnabled();
-
- // exec is mandatory here since we send a signal to the process
- // see https://github.com/symfony/symfony/issues/5030 about prepending
- // command with exec
- $p = $this->getProcess('exec php '.__DIR__.'/NonStopableProcess.php 3');
- $p->start();
- usleep(100000);
- $start = microtime(true);
- $p->stop(1.1, SIGKILL);
- while ($p->isRunning()) {
- usleep(1000);
- }
- $duration = microtime(true) - $start;
-
- $this->assertLessThan(1.8, $duration);
- }
-
- public function testAllOutputIsActuallyReadOnTermination()
- {
- // this code will result in a maximum of 2 reads of 8192 bytes by calling
- // start() and isRunning(). by the time getOutput() is called the process
- // has terminated so the internal pipes array is already empty. normally
- // the call to start() will not read any data as the process will not have
- // generated output, but this is non-deterministic so we must count it as
- // a possibility. therefore we need 2 * ProcessPipes::CHUNK_SIZE plus
- // another byte which will never be read.
- $expectedOutputSize = ProcessPipes::CHUNK_SIZE * 2 + 2;
-
- $code = sprintf('echo str_repeat(\'*\', %d);', $expectedOutputSize);
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
-
- $p->start();
- // Let's wait enough time for process to finish...
- // Here we don't call Process::run or Process::wait to avoid any read of pipes
- usleep(500000);
-
- if ($p->isRunning()) {
- $this->markTestSkipped('Process execution did not complete in the required time frame');
- }
-
- $o = $p->getOutput();
-
- $this->assertEquals($expectedOutputSize, strlen($o));
- }
-
- public function testCallbacksAreExecutedWithStart()
- {
- $data = '';
-
- $process = $this->getProcess('echo foo && php -r "sleep(1);" && echo foo');
- $process->start(function ($type, $buffer) use (&$data) {
- $data .= $buffer;
- });
-
- while ($process->isRunning()) {
- usleep(10000);
- }
-
- $this->assertEquals(2, preg_match_all('/foo/', $data, $matches));
- }
-
- /**
- * tests results from sub processes
- *
- * @dataProvider responsesCodeProvider
- */
- public function testProcessResponses($expected, $getter, $code)
- {
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
- $p->run();
-
- $this->assertSame($expected, $p->$getter());
- }
-
- /**
- * tests results from sub processes
- *
- * @dataProvider pipesCodeProvider
- */
- public function testProcessPipes($code, $size)
- {
- $expected = str_repeat(str_repeat('*', 1024), $size).'!';
- $expectedLength = (1024 * $size) + 1;
-
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
- $p->setInput($expected);
- $p->run();
-
- $this->assertEquals($expectedLength, strlen($p->getOutput()));
- $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
- }
-
- public function testSetInputWhileRunningThrowsAnException()
- {
- $process = $this->getProcess('php -r "usleep(500000);"');
- $process->start();
- try {
- $process->setInput('foobar');
- $process->stop();
- $this->fail('A LogicException should have been raised.');
- } catch (LogicException $e) {
- $this->assertEquals('Input can not be set while the process is running.', $e->getMessage());
- }
- $process->stop();
- }
-
- /**
- * @dataProvider provideInvalidInputValues
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- * @expectedExceptionMessage Symfony\Component\Process\Process::setInput only accepts strings.
- */
- public function testInvalidInput($value)
- {
- $process = $this->getProcess('php -v');
- $process->setInput($value);
- }
-
- public function provideInvalidInputValues()
- {
- return array(
- array(array()),
- array(new NonStringifiable()),
- array(fopen('php://temporary', 'w')),
- );
- }
-
- /**
- * @dataProvider provideInputValues
- */
- public function testValidInput($expected, $value)
- {
- $process = $this->getProcess('php -v');
- $process->setInput($value);
- $this->assertSame($expected, $process->getInput());
- }
-
- public function provideInputValues()
- {
- return array(
- array(null, null),
- array('24.5', 24.5),
- array('input data', 'input data'),
- // to maintain BC, supposed to be removed in 3.0
- array('stringifiable', new Stringifiable()),
- );
- }
-
- public function chainedCommandsOutputProvider()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- return array(
- array("2 \r\n2\r\n", '&&', '2'),
- );
- }
-
- return array(
- array("1\n1\n", ';', '1'),
- array("2\n2\n", '&&', '2'),
- );
- }
-
- /**
- *
- * @dataProvider chainedCommandsOutputProvider
- */
- public function testChainedCommandsOutput($expected, $operator, $input)
- {
- $process = $this->getProcess(sprintf('echo %s %s echo %s', $input, $operator, $input));
- $process->run();
- $this->assertEquals($expected, $process->getOutput());
- }
-
- public function testCallbackIsExecutedForOutput()
- {
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('echo \'foo\';')));
-
- $called = false;
- $p->run(function ($type, $buffer) use (&$called) {
- $called = $buffer === 'foo';
- });
-
- $this->assertTrue($called, 'The callback should be executed with the output');
- }
-
- public function testGetErrorOutput()
- {
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; }')));
-
- $p->run();
- $this->assertEquals(3, preg_match_all('/ERROR/', $p->getErrorOutput(), $matches));
- }
-
- public function testGetIncrementalErrorOutput()
- {
- // use a lock file to toggle between writing ("W") and reading ("R") the
- // error stream
- $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
- file_put_contents($lock, 'W');
-
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
-
- $p->start();
- while ($p->isRunning()) {
- if ('R' === file_get_contents($lock)) {
- $this->assertLessThanOrEqual(1, preg_match_all('/ERROR/', $p->getIncrementalErrorOutput(), $matches));
- file_put_contents($lock, 'W');
- }
- usleep(100);
- }
-
- unlink($lock);
- }
-
- public function testFlushErrorOutput()
- {
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; }')));
-
- $p->run();
- $p->clearErrorOutput();
- $this->assertEmpty($p->getErrorOutput());
- }
-
- public function testGetOutput()
- {
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { echo \' foo \'; $n++; }')));
-
- $p->run();
- $this->assertEquals(3, preg_match_all('/foo/', $p->getOutput(), $matches));
- }
-
- public function testGetIncrementalOutput()
- {
- // use a lock file to toggle between writing ("W") and reading ("R") the
- // output stream
- $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
- file_put_contents($lock, 'W');
-
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { echo \' foo \'; $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
-
- $p->start();
- while ($p->isRunning()) {
- if ('R' === file_get_contents($lock)) {
- $this->assertLessThanOrEqual(1, preg_match_all('/foo/', $p->getIncrementalOutput(), $matches));
- file_put_contents($lock, 'W');
- }
- usleep(100);
- }
-
- unlink($lock);
- }
-
- public function testFlushOutput()
- {
- $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n=0;while ($n<3) {echo \' foo \';$n++;}')));
-
- $p->run();
- $p->clearOutput();
- $this->assertEmpty($p->getOutput());
- }
-
- public function testZeroAsOutput()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- // see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
- $p = $this->getProcess('echo | set /p dummyName=0');
- } else {
- $p = $this->getProcess('printf 0');
- }
-
- $p->run();
- $this->assertSame('0', $p->getOutput());
- }
-
- public function testExitCodeCommandFailed()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX exit code');
- }
-
- // such command run in bash return an exitcode 127
- $process = $this->getProcess('nonexistingcommandIhopeneversomeonewouldnameacommandlikethis');
- $process->run();
-
- $this->assertGreaterThan(0, $process->getExitCode());
- }
-
- public function testTTYCommand()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does have /dev/tty support');
- }
-
- $process = $this->getProcess('echo "foo" >> /dev/null && php -r "usleep(100000);"');
- $process->setTty(true);
- $process->start();
- $this->assertTrue($process->isRunning());
- $process->wait();
-
- $this->assertSame(Process::STATUS_TERMINATED, $process->getStatus());
- }
-
- public function testTTYCommandExitCode()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does have /dev/tty support');
- }
-
- $process = $this->getProcess('echo "foo" >> /dev/null');
- $process->setTty(true);
- $process->run();
-
- $this->assertTrue($process->isSuccessful());
- }
-
- public function testTTYInWindowsEnvironment()
- {
- if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('This test is for Windows platform only');
- }
-
- $process = $this->getProcess('echo "foo" >> /dev/null');
- $process->setTty(false);
- $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'TTY mode is not supported on Windows platform.');
- $process->setTty(true);
- }
-
- public function testExitCodeTextIsNullWhenExitCodeIsNull()
- {
- $process = $this->getProcess('');
- $this->assertNull($process->getExitCodeText());
- }
-
- public function testPTYCommand()
- {
- if (!Process::isPtySupported()) {
- $this->markTestSkipped('PTY is not supported on this operating system.');
- }
-
- $process = $this->getProcess('echo "foo"');
- $process->setPty(true);
- $process->run();
-
- $this->assertSame(Process::STATUS_TERMINATED, $process->getStatus());
- $this->assertEquals("foo\r\n", $process->getOutput());
- }
-
- public function testMustRun()
- {
- $process = $this->getProcess('echo foo');
-
- $this->assertSame($process, $process->mustRun());
- $this->assertEquals("foo".PHP_EOL, $process->getOutput());
- }
-
- public function testSuccessfulMustRunHasCorrectExitCode()
- {
- $process = $this->getProcess('echo foo')->mustRun();
- $this->assertEquals(0, $process->getExitCode());
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\ProcessFailedException
- */
- public function testMustRunThrowsException()
- {
- $process = $this->getProcess('exit 1');
- $process->mustRun();
- }
-
- public function testExitCodeText()
- {
- $process = $this->getProcess('');
- $r = new \ReflectionObject($process);
- $p = $r->getProperty('exitcode');
- $p->setAccessible(true);
-
- $p->setValue($process, 2);
- $this->assertEquals('Misuse of shell builtins', $process->getExitCodeText());
- }
-
- public function testStartIsNonBlocking()
- {
- $process = $this->getProcess('php -r "usleep(500000);"');
- $start = microtime(true);
- $process->start();
- $end = microtime(true);
- $this->assertLessThan(0.2, $end-$start);
- $process->wait();
- }
-
- public function testUpdateStatus()
- {
- $process = $this->getProcess('php -h');
- $process->run();
- $this->assertTrue(strlen($process->getOutput()) > 0);
- }
-
- public function testGetExitCodeIsNullOnStart()
- {
- $process = $this->getProcess('php -r "usleep(200000);"');
- $this->assertNull($process->getExitCode());
- $process->start();
- $this->assertNull($process->getExitCode());
- $process->wait();
- $this->assertEquals(0, $process->getExitCode());
- }
-
- public function testGetExitCodeIsNullOnWhenStartingAgain()
- {
- $process = $this->getProcess('php -r "usleep(200000);"');
- $process->run();
- $this->assertEquals(0, $process->getExitCode());
- $process->start();
- $this->assertNull($process->getExitCode());
- $process->wait();
- $this->assertEquals(0, $process->getExitCode());
- }
-
- public function testGetExitCode()
- {
- $process = $this->getProcess('php -m');
- $process->run();
- $this->assertSame(0, $process->getExitCode());
- }
-
- public function testStatus()
- {
- $process = $this->getProcess('php -r "usleep(500000);"');
- $this->assertFalse($process->isRunning());
- $this->assertFalse($process->isStarted());
- $this->assertFalse($process->isTerminated());
- $this->assertSame(Process::STATUS_READY, $process->getStatus());
- $process->start();
- $this->assertTrue($process->isRunning());
- $this->assertTrue($process->isStarted());
- $this->assertFalse($process->isTerminated());
- $this->assertSame(Process::STATUS_STARTED, $process->getStatus());
- $process->wait();
- $this->assertFalse($process->isRunning());
- $this->assertTrue($process->isStarted());
- $this->assertTrue($process->isTerminated());
- $this->assertSame(Process::STATUS_TERMINATED, $process->getStatus());
- }
-
- public function testStop()
- {
- $process = $this->getProcess('php -r "sleep(4);"');
- $process->start();
- $this->assertTrue($process->isRunning());
- $process->stop();
- $this->assertFalse($process->isRunning());
- }
-
- public function testIsSuccessful()
- {
- $process = $this->getProcess('php -m');
- $process->run();
- $this->assertTrue($process->isSuccessful());
- }
-
- public function testIsSuccessfulOnlyAfterTerminated()
- {
- $process = $this->getProcess('php -r "sleep(1);"');
- $process->start();
- while ($process->isRunning()) {
- $this->assertFalse($process->isSuccessful());
- usleep(300000);
- }
-
- $this->assertTrue($process->isSuccessful());
- }
-
- public function testIsNotSuccessful()
- {
- $process = $this->getProcess('php -r "usleep(500000);throw new \Exception(\'BOUM\');"');
- $process->start();
- $this->assertTrue($process->isRunning());
- $process->wait();
- $this->assertFalse($process->isSuccessful());
- }
-
- public function testProcessIsNotSignaled()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
- $process = $this->getProcess('php -m');
- $process->run();
- $this->assertFalse($process->hasBeenSignaled());
- }
-
- public function testProcessWithoutTermSignalIsNotSignaled()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
- $process = $this->getProcess('php -m');
- $process->run();
- $this->assertFalse($process->hasBeenSignaled());
- }
-
- public function testProcessWithoutTermSignal()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
- $process = $this->getProcess('php -m');
- $process->run();
- $this->assertEquals(0, $process->getTermSignal());
- }
-
- public function testProcessIsSignaledIfStopped()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
- $process = $this->getProcess('php -r "sleep(4);"');
- $process->start();
- $process->stop();
- $this->assertTrue($process->hasBeenSignaled());
- }
-
- public function testProcessWithTermSignal()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
- // SIGTERM is only defined if pcntl extension is present
- $termSignal = defined('SIGTERM') ? SIGTERM : 15;
-
- $process = $this->getProcess('php -r "sleep(4);"');
- $process->start();
- $process->stop();
-
- $this->assertEquals($termSignal, $process->getTermSignal());
- }
-
- public function testProcessThrowsExceptionWhenExternallySignaled()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
- if (!function_exists('posix_kill')) {
- $this->markTestSkipped('posix_kill is required for this test');
- }
-
- $termSignal = defined('SIGKILL') ? SIGKILL : 9;
-
- $process = $this->getProcess('exec php -r "while (true) {}"');
- $process->start();
- posix_kill($process->getPid(), $termSignal);
-
- $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'The process has been signaled with signal "9".');
- $process->wait();
- }
-
- public function testRestart()
- {
- $process1 = $this->getProcess('php -r "echo getmypid();"');
- $process1->run();
- $process2 = $process1->restart();
-
- $process2->wait(); // wait for output
-
- // Ensure that both processed finished and the output is numeric
- $this->assertFalse($process1->isRunning());
- $this->assertFalse($process2->isRunning());
- $this->assertTrue(is_numeric($process1->getOutput()));
- $this->assertTrue(is_numeric($process2->getOutput()));
-
- // Ensure that restart returned a new process by check that the output is different
- $this->assertNotEquals($process1->getOutput(), $process2->getOutput());
- }
-
- public function testPhpDeadlock()
- {
- $this->markTestSkipped('Can cause PHP to hang');
-
- // Sleep doesn't work as it will allow the process to handle signals and close
- // file handles from the other end.
- $process = $this->getProcess('php -r "while (true) {}"');
- $process->start();
-
- // PHP will deadlock when it tries to cleanup $process
- }
-
- public function testRunProcessWithTimeout()
- {
- $timeout = 0.5;
- $process = $this->getProcess('php -r "usleep(600000);"');
- $process->setTimeout($timeout);
- $start = microtime(true);
- try {
- $process->run();
- $this->fail('A RuntimeException should have been raised');
- } catch (RuntimeException $e) {
- }
- $duration = microtime(true) - $start;
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- // Windows is a bit slower as it read file handles, then allow twice the precision
- $maxDuration = $timeout + 2 * Process::TIMEOUT_PRECISION;
- } else {
- $maxDuration = $timeout + Process::TIMEOUT_PRECISION;
- }
-
- $this->assertLessThan($maxDuration, $duration);
- }
-
- public function testCheckTimeoutOnNonStartedProcess()
- {
- $process = $this->getProcess('php -r "sleep(3);"');
- $process->checkTimeout();
- }
-
- public function testCheckTimeoutOnTerminatedProcess()
- {
- $process = $this->getProcess('php -v');
- $process->run();
- $process->checkTimeout();
- }
-
- public function testCheckTimeoutOnStartedProcess()
- {
- $timeout = 0.5;
- $precision = 100000;
- $process = $this->getProcess('php -r "sleep(3);"');
- $process->setTimeout($timeout);
- $start = microtime(true);
-
- $process->start();
-
- try {
- while ($process->isRunning()) {
- $process->checkTimeout();
- usleep($precision);
- }
- $this->fail('A RuntimeException should have been raised');
- } catch (RuntimeException $e) {
- }
- $duration = microtime(true) - $start;
-
- $this->assertLessThan($timeout + $precision, $duration);
- $this->assertFalse($process->isSuccessful());
- }
-
- /**
- * @group idle-timeout
- */
- public function testIdleTimeout()
- {
- $process = $this->getProcess('php -r "sleep(3);"');
- $process->setTimeout(10);
- $process->setIdleTimeout(0.5);
-
- try {
- $process->run();
-
- $this->fail('A timeout exception was expected.');
- } catch (ProcessTimedOutException $ex) {
- $this->assertTrue($ex->isIdleTimeout());
- $this->assertFalse($ex->isGeneralTimeout());
- $this->assertEquals(0.5, $ex->getExceededTimeout());
- }
- }
-
- /**
- * @group idle-timeout
- */
- public function testIdleTimeoutNotExceededWhenOutputIsSent()
- {
- $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); "');
- $process->setTimeout(2);
- $process->setIdleTimeout(1.5);
-
- try {
- $process->run();
- $this->fail('A timeout exception was expected.');
- } catch (ProcessTimedOutException $ex) {
- $this->assertTrue($ex->isGeneralTimeout());
- $this->assertFalse($ex->isIdleTimeout());
- $this->assertEquals(2, $ex->getExceededTimeout());
- }
- }
-
- public function testStartAfterATimeout()
- {
- $process = $this->getProcess('php -r "$n = 1000; while ($n--) {echo \'\'; usleep(1000); }"');
- $process->setTimeout(0.1);
-
- try {
- $process->run();
- $this->fail('An exception should have been raised.');
- } catch (\Exception $e) {
- }
- $process->start();
- usleep(1000);
- $process->stop();
- }
-
- public function testGetPid()
- {
- $process = $this->getProcess('php -r "usleep(500000);"');
- $process->start();
- $this->assertGreaterThan(0, $process->getPid());
- $process->wait();
- }
-
- public function testGetPidIsNullBeforeStart()
- {
- $process = $this->getProcess('php -r "sleep(1);"');
- $this->assertNull($process->getPid());
- }
-
- public function testGetPidIsNullAfterRun()
- {
- $process = $this->getProcess('php -m');
- $process->run();
- $this->assertNull($process->getPid());
- }
-
- public function testSignal()
- {
- $this->verifyPosixIsEnabled();
-
- $process = $this->getProcess('exec php -f '.__DIR__.'/SignalListener.php');
- $process->start();
- usleep(500000);
- $process->signal(SIGUSR1);
-
- while ($process->isRunning() && false === strpos($process->getOutput(), 'Caught SIGUSR1')) {
- usleep(10000);
- }
-
- $this->assertEquals('Caught SIGUSR1', $process->getOutput());
- }
-
- public function testExitCodeIsAvailableAfterSignal()
- {
- $this->verifyPosixIsEnabled();
-
- $process = $this->getProcess('sleep 4');
- $process->start();
- $process->signal(SIGKILL);
-
- while ($process->isRunning()) {
- usleep(10000);
- }
-
- $this->assertFalse($process->isRunning());
- $this->assertTrue($process->hasBeenSignaled());
- $this->assertFalse($process->isSuccessful());
- $this->assertEquals(137, $process->getExitCode());
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- */
- public function testSignalProcessNotRunning()
- {
- $this->verifyPosixIsEnabled();
- $process = $this->getProcess('php -m');
- $process->signal(SIGHUP);
- }
-
- /**
- * @dataProvider provideMethodsThatNeedARunningProcess
- */
- public function testMethodsThatNeedARunningProcess($method)
- {
- $process = $this->getProcess('php -m');
- $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', sprintf('Process must be started before calling %s.', $method));
- call_user_func(array($process, $method));
- }
-
- public function provideMethodsThatNeedARunningProcess()
- {
- return array(
- array('getOutput'),
- array('getIncrementalOutput'),
- array('getErrorOutput'),
- array('getIncrementalErrorOutput'),
- array('wait'),
- );
- }
-
- /**
- * @dataProvider provideMethodsThatNeedATerminatedProcess
- */
- public function testMethodsThatNeedATerminatedProcess($method)
- {
- $process = $this->getProcess('php -r "sleep(1);"');
- $process->start();
- try {
- call_user_func(array($process, $method));
- $process->stop(0);
- $this->fail('A LogicException must have been thrown');
- } catch (\Exception $e) {
- $this->assertInstanceOf('Symfony\Component\Process\Exception\LogicException', $e);
- $this->assertEquals(sprintf('Process must be terminated before calling %s.', $method), $e->getMessage());
- }
- $process->stop(0);
- }
-
- public function provideMethodsThatNeedATerminatedProcess()
- {
- return array(
- array('hasBeenSignaled'),
- array('getTermSignal'),
- array('hasBeenStopped'),
- array('getStopSignal'),
- );
- }
-
- private function verifyPosixIsEnabled()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('POSIX signals do not work on Windows');
- }
- if (!defined('SIGUSR1')) {
- $this->markTestSkipped('The pcntl extension is not enabled');
- }
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- */
- public function testSignalWithWrongIntSignal()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('POSIX signals do not work on Windows');
- }
-
- $process = $this->getProcess('php -r "sleep(3);"');
- $process->start();
- $process->signal(-4);
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- */
- public function testSignalWithWrongNonIntSignal()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('POSIX signals do not work on Windows');
- }
-
- $process = $this->getProcess('php -r "sleep(3);"');
- $process->start();
- $process->signal('Céphalopodes');
- }
-
- public function testDisableOutputDisablesTheOutput()
- {
- $p = $this->getProcess('php -r "usleep(500000);"');
- $this->assertFalse($p->isOutputDisabled());
- $p->disableOutput();
- $this->assertTrue($p->isOutputDisabled());
- $p->enableOutput();
- $this->assertFalse($p->isOutputDisabled());
- }
-
- public function testDisableOutputWhileRunningThrowsException()
- {
- $p = $this->getProcess('php -r "usleep(500000);"');
- $p->start();
- $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'Disabling output while the process is running is not possible.');
- $p->disableOutput();
- }
-
- public function testEnableOutputWhileRunningThrowsException()
- {
- $p = $this->getProcess('php -r "usleep(500000);"');
- $p->disableOutput();
- $p->start();
- $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'Enabling output while the process is running is not possible.');
- $p->enableOutput();
- }
-
- public function testEnableOrDisableOutputAfterRunDoesNotThrowException()
- {
- $p = $this->getProcess('php -r "usleep(500000);"');
- $p->disableOutput();
- $p->start();
- $p->wait();
- $p->enableOutput();
- $p->disableOutput();
- }
-
- public function testDisableOutputWhileIdleTimeoutIsSet()
- {
- $process = $this->getProcess('sleep 3');
- $process->setIdleTimeout(1);
- $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Output can not be disabled while an idle timeout is set.');
- $process->disableOutput();
- }
-
- public function testSetIdleTimeoutWhileOutputIsDisabled()
- {
- $process = $this->getProcess('sleep 3');
- $process->disableOutput();
- $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Idle timeout can not be set while the output is disabled.');
- $process->setIdleTimeout(1);
- }
-
- public function testSetNullIdleTimeoutWhileOutputIsDisabled()
- {
- $process = $this->getProcess('sleep 3');
- $process->disableOutput();
- $process->setIdleTimeout(null);
- }
-
- /**
- * @dataProvider provideStartMethods
- */
- public function testStartWithACallbackAndDisabledOutput($startMethod, $exception, $exceptionMessage)
- {
- $p = $this->getProcess('php -r "usleep(500000);"');
- $p->disableOutput();
- $this->setExpectedException($exception, $exceptionMessage);
- call_user_func(array($p, $startMethod), function () {});
- }
-
- public function provideStartMethods()
- {
- return array(
- array('start', 'Symfony\Component\Process\Exception\LogicException', 'Output has been disabled, enable it to allow the use of a callback.'),
- array('run', 'Symfony\Component\Process\Exception\LogicException', 'Output has been disabled, enable it to allow the use of a callback.'),
- array('mustRun', 'Symfony\Component\Process\Exception\LogicException', 'Output has been disabled, enable it to allow the use of a callback.'),
- );
- }
-
- /**
- * @dataProvider provideOutputFetchingMethods
- */
- public function testGetOutputWhileDisabled($fetchMethod)
- {
- $p = $this->getProcess('php -r "usleep(500000);"');
- $p->disableOutput();
- $p->start();
- $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Output has been disabled.');
- call_user_func(array($p, $fetchMethod));
- }
-
- public function provideOutputFetchingMethods()
- {
- return array(
- array('getOutput'),
- array('getIncrementalOutput'),
- array('getErrorOutput'),
- array('getIncrementalErrorOutput'),
- );
- }
-
- public function responsesCodeProvider()
- {
- return array(
- //expected output / getter / code to execute
- //array(1,'getExitCode','exit(1);'),
- //array(true,'isSuccessful','exit();'),
- array('output', 'getOutput', 'echo \'output\';'),
- );
- }
-
- public function pipesCodeProvider()
- {
- $variations = array(
- 'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',
- 'include \''.__DIR__.'/PipeStdinInStdoutStdErrStreamSelect.php\';',
- );
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- // Avoid XL buffers on Windows because of https://bugs.php.net/bug.php?id=65650
- $sizes = array(1, 2, 4, 8);
- } else {
- $sizes = array(1, 16, 64, 1024, 4096);
- }
-
- $codes = array();
- foreach ($sizes as $size) {
- foreach ($variations as $code) {
- $codes[] = array($code, $size);
- }
- }
-
- return $codes;
- }
-
- /**
- * provides default method names for simple getter/setter
- */
- public function methodProvider()
- {
- $defaults = array(
- array('CommandLine'),
- array('Timeout'),
- array('WorkingDirectory'),
- array('Env'),
- array('Stdin'),
- array('Input'),
- array('Options'),
- );
-
- return $defaults;
- }
-
- /**
- * @param string $commandline
- * @param null|string $cwd
- * @param null|array $env
- * @param null|string $input
- * @param int $timeout
- * @param array $options
- *
- * @return Process
- */
- abstract protected function getProcess($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array());
-}
-
-class Stringifiable
-{
- public function __toString()
- {
- return 'stringifiable';
- }
-}
-
-class NonStringifiable
-{
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php
deleted file mode 100644
index 5fbe1e0aa70fe1c4cc6366550146d8f2a96df625..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\ExecutableFinder;
-
-/**
- * @author Chris Smith <chris@cs278.org>
- */
-class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
-{
- private $path;
-
- public function tearDown()
- {
- if ($this->path) {
- // Restore path if it was changed.
- putenv('PATH='.$this->path);
- }
- }
-
- private function setPath($path)
- {
- $this->path = getenv('PATH');
- putenv('PATH='.$path);
- }
-
- public function testFind()
- {
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
- if (ini_get('open_basedir')) {
- $this->markTestSkipped('Cannot test when open_basedir is set');
- }
-
- $this->setPath(dirname(PHP_BINARY));
-
- $finder = new ExecutableFinder();
- $result = $finder->find($this->getPhpBinaryName());
-
- $this->assertSamePath(PHP_BINARY, $result);
- }
-
- public function testFindWithDefault()
- {
- if (ini_get('open_basedir')) {
- $this->markTestSkipped('Cannot test when open_basedir is set');
- }
-
- $expected = 'defaultValue';
-
- $this->setPath('');
-
- $finder = new ExecutableFinder();
- $result = $finder->find('foo', $expected);
-
- $this->assertEquals($expected, $result);
- }
-
- public function testFindWithExtraDirs()
- {
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
- if (ini_get('open_basedir')) {
- $this->markTestSkipped('Cannot test when open_basedir is set');
- }
-
- $this->setPath('');
-
- $extraDirs = array(dirname(PHP_BINARY));
-
- $finder = new ExecutableFinder();
- $result = $finder->find($this->getPhpBinaryName(), null, $extraDirs);
-
- $this->assertSamePath(PHP_BINARY, $result);
- }
-
- public function testFindWithOpenBaseDir()
- {
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Cannot run test on windows');
- }
-
- if (ini_get('open_basedir')) {
- $this->markTestSkipped('Cannot test when open_basedir is set');
- }
-
- ini_set('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/');
-
- $finder = new ExecutableFinder();
- $result = $finder->find($this->getPhpBinaryName());
-
- $this->assertSamePath(PHP_BINARY, $result);
- }
-
- public function testFindProcessInOpenBasedir()
- {
- if (ini_get('open_basedir')) {
- $this->markTestSkipped('Cannot test when open_basedir is set');
- }
-
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
- $execPath = __DIR__.'/SignalListener.php';
-
- $this->setPath('');
- ini_set('open_basedir', PHP_BINARY.PATH_SEPARATOR.'/');
-
- $finder = new ExecutableFinder();
- $result = $finder->find($this->getPhpBinaryName(), false);
-
- $this->assertSamePath(PHP_BINARY, $result);
- }
-
- private function assertSamePath($expected, $tested)
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals(strtolower($expected), strtolower($tested));
- } else {
- $this->assertEquals($expected, $tested);
- }
- }
-
- private function getPhpBinaryName()
- {
- return basename(PHP_BINARY, defined('PHP_WINDOWS_VERSION_BUILD') ? '.exe' : '');
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php
deleted file mode 100644
index 2183e48c6436d1a770c2497dadb3c9a9a30958bd..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Runs a PHP script that can be stopped only with a SIGKILL (9) signal for 3 seconds
- *
- * @args duration Run this script with a custom duration
- *
- * @example `php NonStopableProcess.php 42` will run the script for 42 seconds
- */
-
-function handleSignal($signal)
-{
- switch ($signal) {
- case SIGTERM:
- $name = 'SIGTERM';
- break;
- case SIGINT:
- $name = 'SIGINT';
- break;
- default:
- $name = $signal.' (unknown)';
- break;
- }
-
- echo "received signal $name\n";
-}
-
-declare (ticks = 1);
-pcntl_signal(SIGTERM, 'handleSignal');
-pcntl_signal(SIGINT, 'handleSignal');
-
-$duration = isset($argv[1]) ? (int) $argv[1] : 3;
-$start = microtime(true);
-
-while ($duration > (microtime(true) - $start)) {
- usleep(1000);
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
deleted file mode 100644
index e16f3f8bed14361076c23b39bb99e5504409af78..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\PhpExecutableFinder;
-
-/**
- * @author Robert Schönthal <seroscho@googlemail.com>
- */
-class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * tests find() with the env var PHP_PATH
- */
- public function testFindWithPhpPath()
- {
- if (defined('PHP_BINARY')) {
- $this->markTestSkipped('The PHP binary is easily available as of PHP 5.4');
- }
-
- $f = new PhpExecutableFinder();
-
- $current = $f->find();
-
- //not executable PHP_PATH
- putenv('PHP_PATH=/not/executable/php');
- $this->assertFalse($f->find(), '::find() returns false for not executable PHP');
- $this->assertFalse($f->find(false), '::find() returns false for not executable PHP');
-
- //executable PHP_PATH
- putenv('PHP_PATH='.$current);
- $this->assertEquals($f->find(), $current, '::find() returns the executable PHP');
- $this->assertEquals($f->find(false), $current, '::find() returns the executable PHP');
- }
-
- /**
- * tests find() with the env var PHP_PATH
- */
- public function testFindWithHHVM()
- {
- if (!defined('HHVM_VERSION')) {
- $this->markTestSkipped('Should be executed in HHVM context.');
- }
-
- $f = new PhpExecutableFinder();
-
- $current = $f->find();
-
- $this->assertEquals($f->find(), $current.' --php', '::find() returns the executable PHP');
- $this->assertEquals($f->find(false), $current, '::find() returns the executable PHP');
- }
-
- /**
- * tests find() with the env var PHP_PATH
- */
- public function testFindArguments()
- {
- $f = new PhpExecutableFinder();
-
- if (defined('HHVM_VERSION')) {
- $this->assertEquals($f->findArguments(), array('--php'), '::findArguments() returns HHVM arguments');
- } else {
- $this->assertEquals($f->findArguments(), array(), '::findArguments() returns no arguments');
- }
- }
-
- /**
- * tests find() with default executable
- */
- public function testFindWithSuffix()
- {
- if (defined('PHP_BINARY')) {
- $this->markTestSkipped('The PHP binary is easily available as of PHP 5.4');
- }
-
- putenv('PHP_PATH=');
- putenv('PHP_PEAR_PHP_BIN=');
- $f = new PhpExecutableFinder();
-
- $current = $f->find();
-
- //TODO maybe php executable is custom or even Windows
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertTrue(is_executable($current));
- $this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
- }
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/PhpProcessTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/PhpProcessTest.php
deleted file mode 100644
index df66ad624be314fd7be72b1835567b741b3f2e2a..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/PhpProcessTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\PhpProcess;
-
-class PhpProcessTest extends \PHPUnit_Framework_TestCase
-{
- public function testNonBlockingWorks()
- {
- $expected = 'hello world!';
- $process = new PhpProcess(<<<PHP
-<?php echo '$expected';
-PHP
- );
- $process->start();
- $process->wait();
- $this->assertEquals($expected, $process->getOutput());
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
deleted file mode 100644
index 89d1f6a1acafb28a42cdf137580d4a4b8347c8ed..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-define('ERR_SELECT_FAILED', 1);
-define('ERR_TIMEOUT', 2);
-define('ERR_READ_FAILED', 3);
-define('ERR_WRITE_FAILED', 4);
-
-$read = array(STDIN);
-$write = array(STDOUT, STDERR);
-
-stream_set_blocking(STDIN, 0);
-stream_set_blocking(STDOUT, 0);
-stream_set_blocking(STDERR, 0);
-
-$out = $err = '';
-while ($read || $write) {
- $r = $read;
- $w = $write;
- $e = null;
- $n = stream_select($r, $w, $e, 5);
-
- if (false === $n) {
- die(ERR_SELECT_FAILED);
- } elseif ($n < 1) {
- die(ERR_TIMEOUT);
- }
-
- if (in_array(STDOUT, $w) && strlen($out) > 0) {
- $written = fwrite(STDOUT, (binary) $out, 32768);
- if (false === $written) {
- die(ERR_WRITE_FAILED);
- }
- $out = (binary) substr($out, $written);
- }
- if (null === $read && strlen($out) < 1) {
- $write = array_diff($write, array(STDOUT));
- }
-
- if (in_array(STDERR, $w) && strlen($err) > 0) {
- $written = fwrite(STDERR, (binary) $err, 32768);
- if (false === $written) {
- die(ERR_WRITE_FAILED);
- }
- $err = (binary) substr($err, $written);
- }
- if (null === $read && strlen($err) < 1) {
- $write = array_diff($write, array(STDERR));
- }
-
- if ($r) {
- $str = fread(STDIN, 32768);
- if (false !== $str) {
- $out .= $str;
- $err .= $str;
- }
- if (false === $str || feof(STDIN)) {
- $read = null;
- if (!feof(STDIN)) {
- die(ERR_READ_FAILED);
- }
- }
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php
deleted file mode 100644
index 56e40520754bc83dd043928ff77fbcac2ed9265a..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\ProcessBuilder;
-
-class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
-{
- public function testInheritEnvironmentVars()
- {
- $_ENV['MY_VAR_1'] = 'foo';
-
- $proc = ProcessBuilder::create()
- ->add('foo')
- ->getProcess();
-
- unset($_ENV['MY_VAR_1']);
-
- $env = $proc->getEnv();
- $this->assertArrayHasKey('MY_VAR_1', $env);
- $this->assertEquals('foo', $env['MY_VAR_1']);
- }
-
- public function testAddEnvironmentVariables()
- {
- $pb = new ProcessBuilder();
- $env = array(
- 'foo' => 'bar',
- 'foo2' => 'bar2',
- );
- $proc = $pb
- ->add('command')
- ->setEnv('foo', 'bar2')
- ->addEnvironmentVariables($env)
- ->inheritEnvironmentVariables(false)
- ->getProcess()
- ;
-
- $this->assertSame($env, $proc->getEnv());
- }
-
- public function testProcessShouldInheritAndOverrideEnvironmentVars()
- {
- $_ENV['MY_VAR_1'] = 'foo';
-
- $proc = ProcessBuilder::create()
- ->setEnv('MY_VAR_1', 'bar')
- ->add('foo')
- ->getProcess();
-
- unset($_ENV['MY_VAR_1']);
-
- $env = $proc->getEnv();
- $this->assertArrayHasKey('MY_VAR_1', $env);
- $this->assertEquals('bar', $env['MY_VAR_1']);
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- */
- public function testNegativeTimeoutFromSetter()
- {
- $pb = new ProcessBuilder();
- $pb->setTimeout(-1);
- }
-
- public function testNullTimeout()
- {
- $pb = new ProcessBuilder();
- $pb->setTimeout(10);
- $pb->setTimeout(null);
-
- $r = new \ReflectionObject($pb);
- $p = $r->getProperty('timeout');
- $p->setAccessible(true);
-
- $this->assertNull($p->getValue($pb));
- }
-
- public function testShouldSetArguments()
- {
- $pb = new ProcessBuilder(array('initial'));
- $pb->setArguments(array('second'));
-
- $proc = $pb->getProcess();
-
- $this->assertContains("second", $proc->getCommandLine());
- }
-
- public function testPrefixIsPrependedToAllGeneratedProcess()
- {
- $pb = new ProcessBuilder();
- $pb->setPrefix('/usr/bin/php');
-
- $proc = $pb->setArguments(array('-v'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals('"/usr/bin/php" "-v"', $proc->getCommandLine());
- } else {
- $this->assertEquals("'/usr/bin/php' '-v'", $proc->getCommandLine());
- }
-
- $proc = $pb->setArguments(array('-i'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals('"/usr/bin/php" "-i"', $proc->getCommandLine());
- } else {
- $this->assertEquals("'/usr/bin/php' '-i'", $proc->getCommandLine());
- }
- }
-
- public function testArrayPrefixesArePrependedToAllGeneratedProcess()
- {
- $pb = new ProcessBuilder();
- $pb->setPrefix(array('/usr/bin/php', 'composer.phar'));
-
- $proc = $pb->setArguments(array('-v'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals('"/usr/bin/php" "composer.phar" "-v"', $proc->getCommandLine());
- } else {
- $this->assertEquals("'/usr/bin/php' 'composer.phar' '-v'", $proc->getCommandLine());
- }
-
- $proc = $pb->setArguments(array('-i'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals('"/usr/bin/php" "composer.phar" "-i"', $proc->getCommandLine());
- } else {
- $this->assertEquals("'/usr/bin/php' 'composer.phar' '-i'", $proc->getCommandLine());
- }
- }
-
- public function testShouldEscapeArguments()
- {
- $pb = new ProcessBuilder(array('%path%', 'foo " bar', '%baz%baz'));
- $proc = $pb->getProcess();
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertSame('^%"path"^% "foo \\" bar" "%baz%baz"', $proc->getCommandLine());
- } else {
- $this->assertSame("'%path%' 'foo \" bar' '%baz%baz'", $proc->getCommandLine());
- }
- }
-
- public function testShouldEscapeArgumentsAndPrefix()
- {
- $pb = new ProcessBuilder(array('arg'));
- $pb->setPrefix('%prefix%');
- $proc = $pb->getProcess();
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertSame('^%"prefix"^% "arg"', $proc->getCommandLine());
- } else {
- $this->assertSame("'%prefix%' 'arg'", $proc->getCommandLine());
- }
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- */
- public function testShouldThrowALogicExceptionIfNoPrefixAndNoArgument()
- {
- ProcessBuilder::create()->getProcess();
- }
-
- public function testShouldNotThrowALogicExceptionIfNoArgument()
- {
- $process = ProcessBuilder::create()
- ->setPrefix('/usr/bin/php')
- ->getProcess();
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals('"/usr/bin/php"', $process->getCommandLine());
- } else {
- $this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
- }
- }
-
- public function testShouldNotThrowALogicExceptionIfNoPrefix()
- {
- $process = ProcessBuilder::create(array('/usr/bin/php'))
- ->getProcess();
-
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->assertEquals('"/usr/bin/php"', $process->getCommandLine());
- } else {
- $this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
- }
- }
-
- public function testShouldReturnProcessWithDisabledOutput()
- {
- $process = ProcessBuilder::create(array('/usr/bin/php'))
- ->disableOutput()
- ->getProcess();
-
- $this->assertTrue($process->isOutputDisabled());
- }
-
- public function testShouldReturnProcessWithEnabledOutput()
- {
- $process = ProcessBuilder::create(array('/usr/bin/php'))
- ->disableOutput()
- ->enableOutput()
- ->getProcess();
-
- $this->assertFalse($process->isOutputDisabled());
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- * @expectedExceptionMessage Symfony\Component\Process\ProcessBuilder::setInput only accepts strings.
- */
- public function testInvalidInput()
- {
- $builder = ProcessBuilder::create();
- $builder->setInput(array());
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
deleted file mode 100644
index c48648f51735f8b0221d3b707180dda6a3c5b198..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\Exception\ProcessFailedException;
-
-/**
- * @author Sebastian Marek <proofek@gmail.com>
- */
-class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * tests ProcessFailedException throws exception if the process was successful
- */
- public function testProcessFailedExceptionThrowsException()
- {
- $process = $this->getMock(
- 'Symfony\Component\Process\Process',
- array('isSuccessful'),
- array('php')
- );
- $process->expects($this->once())
- ->method('isSuccessful')
- ->will($this->returnValue(true));
-
- $this->setExpectedException(
- '\InvalidArgumentException',
- 'Expected a failed process, but the given process was successful.'
- );
-
- new ProcessFailedException($process);
- }
-
- /**
- * tests ProcessFailedException uses information from process output
- * to generate exception message
- */
- public function testProcessFailedExceptionPopulatesInformationFromProcessOutput()
- {
- $cmd = 'php';
- $exitCode = 1;
- $exitText = 'General error';
- $output = "Command output";
- $errorOutput = "FATAL: Unexpected error";
-
- $process = $this->getMock(
- 'Symfony\Component\Process\Process',
- array('isSuccessful', 'getOutput', 'getErrorOutput', 'getExitCode', 'getExitCodeText', 'isOutputDisabled'),
- array($cmd)
- );
- $process->expects($this->once())
- ->method('isSuccessful')
- ->will($this->returnValue(false));
-
- $process->expects($this->once())
- ->method('getOutput')
- ->will($this->returnValue($output));
-
- $process->expects($this->once())
- ->method('getErrorOutput')
- ->will($this->returnValue($errorOutput));
-
- $process->expects($this->once())
- ->method('getExitCode')
- ->will($this->returnValue($exitCode));
-
- $process->expects($this->once())
- ->method('getExitCodeText')
- ->will($this->returnValue($exitText));
-
- $process->expects($this->once())
- ->method('isOutputDisabled')
- ->will($this->returnValue(false));
-
- $exception = new ProcessFailedException($process);
-
- $this->assertEquals(
- "The command \"$cmd\" failed.\nExit Code: $exitCode($exitText)\n\nOutput:\n================\n{$output}\n\nError Output:\n================\n{$errorOutput}",
- $exception->getMessage()
- );
- }
-
- /**
- * Tests that ProcessFailedException does not extract information from
- * process output if it was previously disabled
- */
- public function testDisabledOutputInFailedExceptionDoesNotPopulateOutput()
- {
- $cmd = 'php';
- $exitCode = 1;
- $exitText = 'General error';
-
- $process = $this->getMock(
- 'Symfony\Component\Process\Process',
- array('isSuccessful', 'isOutputDisabled', 'getExitCode', 'getExitCodeText', 'getOutput', 'getErrorOutput'),
- array($cmd)
- );
- $process->expects($this->once())
- ->method('isSuccessful')
- ->will($this->returnValue(false));
-
- $process->expects($this->never())
- ->method('getOutput');
-
- $process->expects($this->never())
- ->method('getErrorOutput');
-
- $process->expects($this->once())
- ->method('getExitCode')
- ->will($this->returnValue($exitCode));
-
- $process->expects($this->once())
- ->method('getExitCodeText')
- ->will($this->returnValue($exitText));
-
- $process->expects($this->once())
- ->method('isOutputDisabled')
- ->will($this->returnValue(true));
-
- $exception = new ProcessFailedException($process);
-
- $this->assertEquals(
- "The command \"$cmd\" failed.\nExit Code: $exitCode($exitText)",
- $exception->getMessage()
- );
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php
deleted file mode 100644
index 8ba94c114d266ee43c054384f30c7a38196cc6e7..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\ProcessUtils;
-
-class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @dataProvider dataArguments
- */
- public function testEscapeArgument($result, $argument)
- {
- $this->assertSame($result, ProcessUtils::escapeArgument($argument));
- }
-
- public function dataArguments()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- return array(
- array('"\"php\" \"-v\""', '"php" "-v"'),
- array('"foo bar"', 'foo bar'),
- array('^%"path"^%', '%path%'),
- array('"<|>\\" \\"\'f"', '<|>" "\'f'),
- array('""', ''),
- array('"with\trailingbs\\\\"', 'with\trailingbs\\'),
- );
- }
-
- return array(
- array("'\"php\" \"-v\"'", '"php" "-v"'),
- array("'foo bar'", 'foo bar'),
- array("'%path%'", '%path%'),
- array("'<|>\" \"'\\''f'", '<|>" "\'f'),
- array("''", ''),
- array("'with\\trailingbs\\'", 'with\trailingbs\\'),
- );
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
deleted file mode 100644
index fdae5ec25e41dbb2315c5f6e94a8bb46df502bc5..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?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\Process\Tests;
-
-class SigchildDisabledProcessTest extends AbstractProcessTest
-{
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testGetExitCode()
- {
- parent::testGetExitCode();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testGetExitCodeIsNullOnStart()
- {
- parent::testGetExitCodeIsNullOnStart();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testGetExitCodeIsNullOnWhenStartingAgain()
- {
- parent::testGetExitCodeIsNullOnWhenStartingAgain();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testExitCodeCommandFailed()
- {
- parent::testExitCodeCommandFailed();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testMustRun()
- {
- parent::testMustRun();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testSuccessfulMustRunHasCorrectExitCode()
- {
- parent::testSuccessfulMustRunHasCorrectExitCode();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- */
- public function testMustRunThrowsException()
- {
- parent::testMustRunThrowsException();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- */
- public function testProcessIsSignaledIfStopped()
- {
- parent::testProcessIsSignaledIfStopped();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessWithTermSignal()
- {
- parent::testProcessWithTermSignal();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessIsNotSignaled()
- {
- parent::testProcessIsNotSignaled();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessWithoutTermSignal()
- {
- parent::testProcessWithoutTermSignal();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testCheckTimeoutOnStartedProcess()
- {
- parent::testCheckTimeoutOnStartedProcess();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.
- */
- public function testGetPid()
- {
- parent::testGetPid();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.
- */
- public function testGetPidIsNullBeforeStart()
- {
- parent::testGetPidIsNullBeforeStart();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.
- */
- public function testGetPidIsNullAfterRun()
- {
- parent::testGetPidIsNullAfterRun();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testExitCodeText()
- {
- $process = $this->getProcess('qdfsmfkqsdfmqmsd');
- $process->run();
-
- $process->getExitCodeText();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testExitCodeTextIsNullWhenExitCodeIsNull()
- {
- parent::testExitCodeTextIsNullWhenExitCodeIsNull();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testIsSuccessful()
- {
- parent::testIsSuccessful();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testIsSuccessfulOnlyAfterTerminated()
- {
- parent::testIsSuccessfulOnlyAfterTerminated();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testIsNotSuccessful()
- {
- parent::testIsNotSuccessful();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
- */
- public function testTTYCommandExitCode()
- {
- parent::testTTYCommandExitCode();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process can not be signaled.
- */
- public function testSignal()
- {
- parent::testSignal();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessWithoutTermSignalIsNotSignaled()
- {
- parent::testProcessWithoutTermSignalIsNotSignaled();
- }
-
- public function testStopWithTimeoutIsActuallyWorking()
- {
- $this->markTestSkipped('Stopping with signal is not supported in sigchild environment');
- }
-
- public function testProcessThrowsExceptionWhenExternallySignaled()
- {
- $this->markTestSkipped('Retrieving Pid is not supported in sigchild environment');
- }
-
- public function testExitCodeIsAvailableAfterSignal()
- {
- $this->markTestSkipped('Signal is not supported in sigchild environment');
- }
-
- public function testRunProcessWithTimeout()
- {
- $this->markTestSkipped('Signal (required for timeout) is not supported in sigchild environment');
- }
-
- public function provideStartMethods()
- {
- return array(
- array('start', 'Symfony\Component\Process\Exception\LogicException', 'Output has been disabled, enable it to allow the use of a callback.'),
- array('run', 'Symfony\Component\Process\Exception\LogicException', 'Output has been disabled, enable it to allow the use of a callback.'),
- array('mustRun', 'Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.'),
- );
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getProcess($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
- {
- $process = new ProcessInSigchildEnvironment($commandline, $cwd, $env, $input, $timeout, $options);
- $process->setEnhanceSigchildCompatibility(false);
-
- return $process;
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
deleted file mode 100644
index 3fea3ba1cd337d91409b1932277510dc11b1b0a4..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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\Process\Tests;
-
-class SigchildEnabledProcessTest extends AbstractProcessTest
-{
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessIsSignaledIfStopped()
- {
- parent::testProcessIsSignaledIfStopped();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessWithTermSignal()
- {
- parent::testProcessWithTermSignal();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessIsNotSignaled()
- {
- parent::testProcessIsNotSignaled();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessWithoutTermSignal()
- {
- parent::testProcessWithoutTermSignal();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.
- */
- public function testGetPid()
- {
- parent::testGetPid();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.
- */
- public function testGetPidIsNullBeforeStart()
- {
- parent::testGetPidIsNullBeforeStart();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.
- */
- public function testGetPidIsNullAfterRun()
- {
- parent::testGetPidIsNullAfterRun();
- }
-
- public function testExitCodeText()
- {
- $process = $this->getProcess('qdfsmfkqsdfmqmsd');
- $process->run();
-
- $this->assertInternalType('string', $process->getExitCodeText());
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. The process can not be signaled.
- */
- public function testSignal()
- {
- parent::testSignal();
- }
-
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
- */
- public function testProcessWithoutTermSignalIsNotSignaled()
- {
- parent::testProcessWithoutTermSignalIsNotSignaled();
- }
-
- public function testProcessThrowsExceptionWhenExternallySignaled()
- {
- $this->markTestSkipped('Retrieving Pid is not supported in sigchild environment');
- }
-
- public function testExitCodeIsAvailableAfterSignal()
- {
- $this->markTestSkipped('Signal is not supported in sigchild environment');
- }
-
- public function testStartAfterATimeout()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Restarting a timed-out process on Windows is not supported in sigchild environment');
- }
- parent::testStartAfterATimeout();
- }
-
- public function testStopWithTimeoutIsActuallyWorking()
- {
- $this->markTestSkipped('Stopping with signal is not supported in sigchild environment');
- }
-
- public function testRunProcessWithTimeout()
- {
- $this->markTestSkipped('Signal (required for timeout) is not supported in sigchild environment');
- }
-
- public function testCheckTimeoutOnStartedProcess()
- {
- $this->markTestSkipped('Signal (required for timeout) is not supported in sigchild environment');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getProcess($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
- {
- $process = new ProcessInSigchildEnvironment($commandline, $cwd, $env, $input, $timeout, $options);
- $process->setEnhanceSigchildCompatibility(true);
-
- return $process;
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SignalListener.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/SignalListener.php
deleted file mode 100644
index 32910e17068746718773733b8f6df9a2ab177736..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SignalListener.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// required for signal handling
-declare (ticks = 1);
-
-pcntl_signal(SIGUSR1, function () {echo "Caught SIGUSR1"; exit;});
-
-$n = 0;
-
-// ticks require activity to work - sleep(4); does not work
-while ($n < 400) {
- usleep(10000);
- $n++;
-}
-
-return;
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php
deleted file mode 100644
index cd206ea4c390c75d88f224c33d9cf3c97dc43162..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?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\Process\Tests;
-
-use Symfony\Component\Process\Process;
-
-class SimpleProcessTest extends AbstractProcessTest
-{
- private $enabledSigchild = false;
-
- public function setUp()
- {
- ob_start();
- phpinfo(INFO_GENERAL);
-
- $this->enabledSigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
- }
-
- public function testGetExitCode()
- {
- $this->skipIfPHPSigchild(); // This test use exitcode that is not available in this case
- parent::testGetExitCode();
- }
-
- public function testExitCodeCommandFailed()
- {
- $this->skipIfPHPSigchild(); // This test use exitcode that is not available in this case
- parent::testExitCodeCommandFailed();
- }
-
- public function testProcessIsSignaledIfStopped()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved');
- parent::testProcessIsSignaledIfStopped();
- }
-
- public function testProcessWithTermSignal()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved');
- parent::testProcessWithTermSignal();
- }
-
- public function testProcessIsNotSignaled()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved');
- parent::testProcessIsNotSignaled();
- }
-
- public function testProcessWithoutTermSignal()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved');
- parent::testProcessWithoutTermSignal();
- }
-
- public function testExitCodeText()
- {
- $this->skipIfPHPSigchild(); // This test use exitcode that is not available in this case
- parent::testExitCodeText();
- }
-
- public function testIsSuccessful()
- {
- $this->skipIfPHPSigchild(); // This test use PID that is not available in this case
- parent::testIsSuccessful();
- }
-
- public function testIsNotSuccessful()
- {
- $this->skipIfPHPSigchild(); // This test use PID that is not available in this case
- parent::testIsNotSuccessful();
- }
-
- public function testGetPid()
- {
- $this->skipIfPHPSigchild(); // This test use PID that is not available in this case
- parent::testGetPid();
- }
-
- public function testGetPidIsNullBeforeStart()
- {
- $this->skipIfPHPSigchild(); // This test use PID that is not available in this case
- parent::testGetPidIsNullBeforeStart();
- }
-
- public function testGetPidIsNullAfterRun()
- {
- $this->skipIfPHPSigchild(); // This test use PID that is not available in this case
- parent::testGetPidIsNullAfterRun();
- }
-
- public function testSignal()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
- parent::testSignal();
- }
-
- public function testProcessWithoutTermSignalIsNotSignaled()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved');
- parent::testProcessWithoutTermSignalIsNotSignaled();
- }
-
- public function testProcessThrowsExceptionWhenExternallySignaled()
- {
- $this->skipIfPHPSigchild(); // This test use PID that is not available in this case
- parent::testProcessThrowsExceptionWhenExternallySignaled();
- }
-
- public function testExitCodeIsAvailableAfterSignal()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
- parent::testExitCodeIsAvailableAfterSignal();
- }
-
- public function testSignalProcessNotRunning()
- {
- $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Can not send signal on a non running process.');
- parent::testSignalProcessNotRunning();
- }
-
- public function testSignalWithWrongIntSignal()
- {
- if ($this->enabledSigchild) {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
- } else {
- $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'Error while sending signal `-4`.');
- }
- parent::testSignalWithWrongIntSignal();
- }
-
- public function testSignalWithWrongNonIntSignal()
- {
- if ($this->enabledSigchild) {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
- } else {
- $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'Error while sending signal `Céphalopodes`.');
- }
- parent::testSignalWithWrongNonIntSignal();
- }
-
- public function testStopTerminatesProcessCleanly()
- {
- try {
- $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'bar\';"');
- $process->run(function () use ($process) {
- $process->stop();
- });
- } catch (RuntimeException $e) {
- $this->fail('A call to stop() is not expected to cause wait() to throw a RuntimeException');
- }
- }
-
- public function testKillSignalTerminatesProcessCleanly()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
-
- try {
- $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'bar\';"');
- $process->run(function () use ($process) {
- if ($process->isRunning()) {
- $process->signal(defined('SIGKILL') ? SIGKILL : 9);
- }
- });
- } catch (RuntimeException $e) {
- $this->fail('A call to signal() is not expected to cause wait() to throw a RuntimeException');
- }
- }
-
- public function testTermSignalTerminatesProcessCleanly()
- {
- $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
-
- try {
- $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'bar\';"');
- $process->run(function () use ($process) {
- if ($process->isRunning()) {
- $process->signal(defined('SIGTERM') ? SIGTERM : 15);
- }
- });
- } catch (RuntimeException $e) {
- $this->fail('A call to signal() is not expected to cause wait() to throw a RuntimeException');
- }
- }
-
- public function testStopWithTimeoutIsActuallyWorking()
- {
- $this->skipIfPHPSigchild();
-
- parent::testStopWithTimeoutIsActuallyWorking();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getProcess($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
- {
- return new Process($commandline, $cwd, $env, $input, $timeout, $options);
- }
-
- private function skipIfPHPSigchild()
- {
- if ($this->enabledSigchild) {
- $this->markTestSkipped('Your PHP has been compiled with --enable-sigchild, this test can not be executed');
- }
- }
-
- private function expectExceptionIfPHPSigchild($classname, $message)
- {
- if ($this->enabledSigchild) {
- $this->setExpectedException($classname, $message);
- }
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/composer.json b/core/vendor/symfony/process/Symfony/Component/Process/composer.json
deleted file mode 100644
index b5dbfe1390a2bf674a3aba8ed2898e3241e2def1..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "name": "symfony/process",
- "type": "library",
- "description": "Symfony Process Component",
- "keywords": [],
- "homepage": "http://symfony.com",
- "license": "MIT",
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- }
- ],
- "require": {
- "php": ">=5.3.3"
- },
- "autoload": {
- "psr-0": { "Symfony\\Component\\Process\\": "" }
- },
- "target-dir": "Symfony/Component/Process",
- "minimum-stability": "dev",
- "extra": {
- "branch-alias": {
- "dev-master": "2.5-dev"
- }
- }
-}
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist b/core/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist
deleted file mode 100644
index fcb230a06259fb48e93898f972d1a52722d61dd3..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
- backupGlobals="false"
- colors="true"
- bootstrap="vendor/autoload.php"
->
- <testsuites>
- <testsuite name="Symfony Process Component Test Suite">
- <directory>./Tests/</directory>
- </testsuite>
- </testsuites>
-
- <filter>
- <whitelist>
- <directory>./</directory>
- <exclude>
- <directory>./Tests</directory>
- </exclude>
- </whitelist>
- </filter>
-</phpunit>
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md b/core/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md
index 8b604ead11510b154d206778433b62c7d692b55b..b5fd9db949d47c6cdde25270cd4b9d7bfbbaf5bb 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md
@@ -23,17 +23,21 @@ CHANGELOG
Before:
- ```
+ ```yaml
article_edit:
pattern: /article/{id}
requirements: { '_method': 'POST|PUT', '_scheme': 'https', 'id': '\d+' }
+ ```
+ ```xml
<route id="article_edit" pattern="/article/{id}">
<requirement key="_method">POST|PUT</requirement>
<requirement key="_scheme">https</requirement>
<requirement key="id">\d+</requirement>
</route>
+ ```
+ ```php
$route = new Route();
$route->setPattern('/article/{id}');
$route->setRequirement('_method', 'POST|PUT');
@@ -42,17 +46,21 @@ CHANGELOG
After:
- ```
+ ```yaml
article_edit:
path: /article/{id}
methods: [POST, PUT]
schemes: https
requirements: { 'id': '\d+' }
+ ```
+ ```xml
<route id="article_edit" pattern="/article/{id}" methods="POST PUT" schemes="https">
<requirement key="id">\d+</requirement>
</route>
+ ```
+ ```php
$route = new Route();
$route->setPath('/article/{id}');
$route->setMethods(array('POST', 'PUT'));
@@ -66,7 +74,7 @@ CHANGELOG
Before:
- ```
+ ```php
$rootCollection = new RouteCollection();
$subCollection = new RouteCollection();
$rootCollection->addCollection($subCollection);
@@ -75,7 +83,7 @@ CHANGELOG
After:
- ```
+ ```php
$rootCollection = new RouteCollection();
$subCollection = new RouteCollection();
$subCollection->add('foo', new Route('/foo'));
@@ -85,8 +93,8 @@ CHANGELOG
Also one must call `addCollection` from the bottom to the top hierarchy.
So the correct sequence is the following (and not the reverse):
- ```
- $childCollection->->addCollection($grandchildCollection);
+ ```php
+ $childCollection->addCollection($grandchildCollection);
$rootCollection->addCollection($childCollection);
```
@@ -112,7 +120,7 @@ CHANGELOG
use-case instead.
Before: `$parentCollection->addCollection($collection, '/prefix', array(...), array(...))`
After:
- ```
+ ```php
$collection->addPrefix('/prefix', array(...), array(...));
$parentCollection->addCollection($collection);
```
@@ -164,6 +172,6 @@ CHANGELOG
been used anyway without creating inconsistencies
* [BC BREAK] RouteCollection::remove also removes a route from parent
collections (not only from its children)
- * added ConfigurableRequirementsInterface that allows to disable exceptions
+ * added ConfigurableRequirementsInterface that allows to disable exceptions
(and generate empty URLs instead) when generating a route with an invalid
parameter value
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php b/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php
index 5e4c96073e718d3837b21e82c72894783bb22655..7b21fe9eabb7e8ba908c48626eb0efdc891562a8 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php
@@ -16,7 +16,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class CompiledRoute
+class CompiledRoute implements \Serializable
{
private $variables;
private $tokens;
@@ -51,6 +51,39 @@ public function __construct($staticPrefix, $regex, array $tokens, array $pathVar
$this->variables = $variables;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function serialize()
+ {
+ return serialize(array(
+ 'vars' => $this->variables,
+ 'path_prefix' => $this->staticPrefix,
+ 'path_regex' => $this->regex,
+ 'path_tokens' => $this->tokens,
+ 'path_vars' => $this->pathVariables,
+ 'host_regex' => $this->hostRegex,
+ 'host_tokens' => $this->hostTokens,
+ 'host_vars' => $this->hostVariables,
+ ));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function unserialize($serialized)
+ {
+ $data = unserialize($serialized);
+ $this->variables = $data['vars'];
+ $this->staticPrefix = $data['path_prefix'];
+ $this->regex = $data['path_regex'];
+ $this->tokens = $data['path_tokens'];
+ $this->pathVariables = $data['path_vars'];
+ $this->hostRegex = $data['host_regex'];
+ $this->hostTokens = $data['host_tokens'];
+ $this->hostVariables = $data['host_vars'];
+ }
+
/**
* Returns the static prefix.
*
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
index 8d4203019c4f1b227d7a78d16bab12066e45a80f..9b7e4830c9df35e1c1b7eb57bb4d5c3ea6f7435d 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -38,7 +38,7 @@ class PhpGeneratorDumper extends GeneratorDumper
public function dump(array $options = array())
{
$options = array_merge(array(
- 'class' => 'ProjectUrlGenerator',
+ 'class' => 'ProjectUrlGenerator',
'base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
), $options);
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php
index ccb9d968c8b9e2d34509371af74c2c42c2b03698..0deb666fb4abedddd9143e4c7c7914d09167a206 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -279,7 +279,9 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
// add a query string if needed
$extra = array_diff_key($parameters, $variables, $defaults);
if ($extra && $query = http_build_query($extra, '', '&')) {
- $url .= '?'.$query;
+ // "/" and "?" can be left decoded for better user experience, see
+ // http://tools.ietf.org/html/rfc3986#section-3.4
+ $url .= '?'.strtr($query, array('%2F' => '/'));
}
return $url;
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index f6d44252157a14d0d56706b1a04f01d4717b7654..92abf3648ace1961deff6af4e4d7542ede0673d3 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -209,14 +209,14 @@ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMetho
protected function getGlobals(\ReflectionClass $class)
{
$globals = array(
- 'path' => '',
+ 'path' => '',
'requirements' => array(),
- 'options' => array(),
- 'defaults' => array(),
- 'schemes' => array(),
- 'methods' => array(),
- 'host' => '',
- 'condition' => '',
+ 'options' => array(),
+ 'defaults' => array(),
+ 'schemes' => array(),
+ 'methods' => array(),
+ 'host' => '',
+ 'condition' => '',
);
if ($annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/PhpFileLoader.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/PhpFileLoader.php
index 98b7efbf479a04a55e79aafa8d1cb648d9c3f50c..d1970e52da81d39df201810561dcce170da178c1 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/PhpFileLoader.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/PhpFileLoader.php
@@ -38,13 +38,10 @@ class PhpFileLoader extends FileLoader
*/
public function load($file, $type = null)
{
- // the loader variable is exposed to the included file below
- $loader = $this;
-
$path = $this->locator->locate($file);
$this->setCurrentDir(dirname($path));
- $collection = include $path;
+ $collection = self::includeFile($path, $this);
$collection->addResource(new FileResource($path));
return $collection;
@@ -59,4 +56,17 @@ public function supports($resource, $type = null)
{
return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'php' === $type);
}
+
+ /**
+ * Safe include. Used for scope isolation.
+ *
+ * @param string $file File to include
+ * @param PhpFileLoader $loader the loader variable is exposed to the included file below
+ *
+ * @return RouteCollection
+ */
+ private static function includeFile($file, PhpFileLoader $loader)
+ {
+ return include $file;
+ }
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
index fc76c192778c546a38b1083344e0eafb4b736252..4ba115b5bfd3319d068ff474ce82a4c882349b3b 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
@@ -43,7 +43,7 @@ public function dump(array $options = array())
{
$options = array_merge(array(
'script_name' => 'app.php',
- 'base_uri' => '',
+ 'base_uri' => '',
), $options);
$options['script_name'] = self::escape($options['script_name'], ' ', '\\');
@@ -141,10 +141,10 @@ private function dumpRoute($name, $route, array $options, $hostRegexUnique)
}
foreach ($this->normalizeValues($route->getDefaults()) as $key => $value) {
$variables[] = 'E=_ROUTING_default_'.$key.':'.strtr($value, array(
- ':' => '\\:',
- '=' => '\\=',
+ ':' => '\\:',
+ '=' => '\\=',
'\\' => '\\\\',
- ' ' => '\\ ',
+ ' ' => '\\ ',
));
}
$variables = implode(',', $variables);
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index 859ffcb8374644c4933174cfc4f31a967b1b6149..ad3d85c484d770da06f51a002d5ad8be17cf743c 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -14,6 +14,7 @@
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
/**
* PhpMatcherDumper creates a PHP class able to match URLs for a given set of routes.
@@ -26,6 +27,11 @@ class PhpMatcherDumper extends MatcherDumper
{
private $expressionLanguage;
+ /**
+ * @var ExpressionFunctionProviderInterface[]
+ */
+ private $expressionLanguageProviders = array();
+
/**
* Dumps a set of routes to a PHP class.
*
@@ -41,7 +47,7 @@ class PhpMatcherDumper extends MatcherDumper
public function dump(array $options = array())
{
$options = array_replace(array(
- 'class' => 'ProjectUrlMatcher',
+ 'class' => 'ProjectUrlMatcher',
'base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
), $options);
@@ -78,6 +84,11 @@ public function __construct(RequestContext \$context)
EOF;
}
+ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
+ {
+ $this->expressionLanguageProviders[] = $provider;
+ }
+
/**
* Generates the code for the match method implementing UrlMatcherInterface.
*
@@ -393,7 +404,7 @@ private function getExpressionLanguage()
if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
}
- $this->expressionLanguage = new ExpressionLanguage();
+ $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
}
return $this->expressionLanguage;
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
index 22af699d4a7c27d80b5aa97e5b7a98e09aa7ed82..35296c6c6e3ada078f3e4f5ee1a76b740292815e 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
@@ -24,7 +24,7 @@ class TraceableUrlMatcher extends UrlMatcher
{
const ROUTE_DOES_NOT_MATCH = 0;
const ROUTE_ALMOST_MATCHES = 1;
- const ROUTE_MATCHES = 2;
+ const ROUTE_MATCHES = 2;
protected $traces;
@@ -122,10 +122,10 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
private function addTrace($log, $level = self::ROUTE_DOES_NOT_MATCH, $name = null, $route = null)
{
$this->traces[] = array(
- 'log' => $log,
- 'name' => $name,
+ 'log' => $log,
+ 'name' => $name,
'level' => $level,
- 'path' => null !== $route ? $route->getPath() : null,
+ 'path' => null !== $route ? $route->getPath() : null,
);
}
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php
index 8d081a8629de5d4f719087e03902541dd4a5c6e4..3ed5ac7fb33a7b495be3836b9a24fb1220fe8448 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -18,6 +18,7 @@
use Symfony\Component\Routing\Route;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
/**
* UrlMatcher matches URL based on a set of routes.
@@ -28,9 +29,9 @@
*/
class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
{
- const REQUIREMENT_MATCH = 0;
- const REQUIREMENT_MISMATCH = 1;
- const ROUTE_MATCH = 2;
+ const REQUIREMENT_MATCH = 0;
+ const REQUIREMENT_MISMATCH = 1;
+ const ROUTE_MATCH = 2;
/**
* @var RequestContext
@@ -50,6 +51,11 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
protected $request;
protected $expressionLanguage;
+ /**
+ * @var ExpressionFunctionProviderInterface[]
+ */
+ protected $expressionLanguageProviders = array();
+
/**
* Constructor.
*
@@ -93,7 +99,7 @@ public function match($pathinfo)
throw 0 < count($this->allow)
? new MethodNotAllowedException(array_unique(array_map('strtoupper', $this->allow)))
- : new ResourceNotFoundException();
+ : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
}
/**
@@ -110,6 +116,11 @@ public function matchRequest(Request $request)
return $ret;
}
+ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
+ {
+ $this->expressionLanguageProviders[] = $provider;
+ }
+
/**
* Tries to match a URL with a set of routes.
*
@@ -236,7 +247,7 @@ protected function getExpressionLanguage()
if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
}
- $this->expressionLanguage = new ExpressionLanguage();
+ $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
}
return $this->expressionLanguage;
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/README.md b/core/vendor/symfony/routing/Symfony/Component/Routing/README.md
index 83febc79bbda839ddd66c8b21a7b6f0c04ed7256..cd566a59c1c8a3e29f1a4601510651ad6d608328 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/README.md
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/README.md
@@ -6,23 +6,25 @@ Routing associates a request with the code that will convert it to a response.
The example below demonstrates how you can set up a fully working routing
system:
- use Symfony\Component\HttpFoundation\Request;
- use Symfony\Component\Routing\Matcher\UrlMatcher;
- use Symfony\Component\Routing\RequestContext;
- use Symfony\Component\Routing\RouteCollection;
- use Symfony\Component\Routing\Route;
+```php
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\Route;
- $routes = new RouteCollection();
- $routes->add('hello', new Route('/hello', array('controller' => 'foo')));
+$routes = new RouteCollection();
+$routes->add('hello', new Route('/hello', array('controller' => 'foo')));
- $context = new RequestContext();
+$context = new RequestContext();
- // this is optional and can be done without a Request instance
- $context->fromRequest(Request::createFromGlobals());
+// this is optional and can be done without a Request instance
+$context->fromRequest(Request::createFromGlobals());
- $matcher = new UrlMatcher($routes, $context);
+$matcher = new UrlMatcher($routes, $context);
- $parameters = $matcher->match('/hello');
+$parameters = $matcher->match('/hello');
+```
Resources
---------
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php b/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php
index 93fd09ad5b1e11349d0c71f7ae33f15a22ccfb21..b6c71ffeebd38b78b89332e1c89326ba4a021d19 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php
@@ -16,7 +16,10 @@
/**
* Holds information about the current request.
*
+ * This class implements a fluent interface.
+ *
* @author Fabien Potencier <fabien@symfony.com>
+ * @author Tobias Schultze <http://tobion.de>
*
* @api
*/
@@ -52,16 +55,23 @@ class RequestContext
*/
public function __construct($baseUrl = '', $method = 'GET', $host = 'localhost', $scheme = 'http', $httpPort = 80, $httpsPort = 443, $path = '/', $queryString = '')
{
- $this->baseUrl = $baseUrl;
- $this->method = strtoupper($method);
- $this->host = $host;
- $this->scheme = strtolower($scheme);
- $this->httpPort = $httpPort;
- $this->httpsPort = $httpsPort;
- $this->pathInfo = $path;
- $this->queryString = $queryString;
+ $this->setBaseUrl($baseUrl);
+ $this->setMethod($method);
+ $this->setHost($host);
+ $this->setScheme($scheme);
+ $this->setHttpPort($httpPort);
+ $this->setHttpsPort($httpsPort);
+ $this->setPathInfo($path);
+ $this->setQueryString($queryString);
}
+ /**
+ * Updates the RequestContext information based on a HttpFoundation Request.
+ *
+ * @param Request $request A Request instance
+ *
+ * @return RequestContext The current instance, implementing a fluent interface
+ */
public function fromRequest(Request $request)
{
$this->setBaseUrl($request->getBaseUrl());
@@ -71,7 +81,9 @@ public function fromRequest(Request $request)
$this->setScheme($request->getScheme());
$this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
$this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
- $this->setQueryString($request->server->get('QUERY_STRING'));
+ $this->setQueryString($request->server->get('QUERY_STRING', ''));
+
+ return $this;
}
/**
@@ -89,11 +101,15 @@ public function getBaseUrl()
*
* @param string $baseUrl The base URL
*
+ * @return RequestContext The current instance, implementing a fluent interface
+ *
* @api
*/
public function setBaseUrl($baseUrl)
{
$this->baseUrl = $baseUrl;
+
+ return $this;
}
/**
@@ -110,10 +126,14 @@ public function getPathInfo()
* Sets the path info.
*
* @param string $pathInfo The path info
+ *
+ * @return RequestContext The current instance, implementing a fluent interface
*/
public function setPathInfo($pathInfo)
{
$this->pathInfo = $pathInfo;
+
+ return $this;
}
/**
@@ -133,16 +153,22 @@ public function getMethod()
*
* @param string $method The HTTP method
*
+ * @return RequestContext The current instance, implementing a fluent interface
+ *
* @api
*/
public function setMethod($method)
{
$this->method = strtoupper($method);
+
+ return $this;
}
/**
* Gets the HTTP host.
*
+ * The host is always lowercased because it must be treated case-insensitive.
+ *
* @return string The HTTP host
*/
public function getHost()
@@ -155,11 +181,15 @@ public function getHost()
*
* @param string $host The HTTP host
*
+ * @return RequestContext The current instance, implementing a fluent interface
+ *
* @api
*/
public function setHost($host)
{
- $this->host = $host;
+ $this->host = strtolower($host);
+
+ return $this;
}
/**
@@ -177,17 +207,21 @@ public function getScheme()
*
* @param string $scheme The HTTP scheme
*
+ * @return RequestContext The current instance, implementing a fluent interface
+ *
* @api
*/
public function setScheme($scheme)
{
$this->scheme = strtolower($scheme);
+
+ return $this;
}
/**
* Gets the HTTP port.
*
- * @return string The HTTP port
+ * @return int The HTTP port
*/
public function getHttpPort()
{
@@ -197,19 +231,23 @@ public function getHttpPort()
/**
* Sets the HTTP port.
*
- * @param string $httpPort The HTTP port
+ * @param int $httpPort The HTTP port
+ *
+ * @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setHttpPort($httpPort)
{
- $this->httpPort = $httpPort;
+ $this->httpPort = (int) $httpPort;
+
+ return $this;
}
/**
* Gets the HTTPS port.
*
- * @return string The HTTPS port
+ * @return int The HTTPS port
*/
public function getHttpsPort()
{
@@ -219,19 +257,23 @@ public function getHttpsPort()
/**
* Sets the HTTPS port.
*
- * @param string $httpsPort The HTTPS port
+ * @param int $httpsPort The HTTPS port
+ *
+ * @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setHttpsPort($httpsPort)
{
- $this->httpsPort = $httpsPort;
+ $this->httpsPort = (int) $httpsPort;
+
+ return $this;
}
/**
* Gets the query string.
*
- * @return string The query string
+ * @return string The query string without the "?"
*/
public function getQueryString()
{
@@ -241,13 +283,18 @@ public function getQueryString()
/**
* Sets the query string.
*
- * @param string $queryString The query string
+ * @param string $queryString The query string (after "?")
+ *
+ * @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setQueryString($queryString)
{
- $this->queryString = $queryString;
+ // string cast to be fault-tolerant, accepting null
+ $this->queryString = (string) $queryString;
+
+ return $this;
}
/**
@@ -263,11 +310,9 @@ public function getParameters()
/**
* Sets the parameters.
*
- * This method implements a fluent interface.
- *
* @param array $parameters The parameters
*
- * @return Route The current Route instance
+ * @return RequestContext The current instance, implementing a fluent interface
*/
public function setParameters(array $parameters)
{
@@ -281,7 +326,7 @@ public function setParameters(array $parameters)
*
* @param string $name A parameter name
*
- * @return mixed The parameter value
+ * @return mixed The parameter value or null if nonexistent
*/
public function getParameter($name)
{
@@ -293,7 +338,7 @@ public function getParameter($name)
*
* @param string $name A parameter name
*
- * @return bool true if the parameter value is set, false otherwise
+ * @return bool True if the parameter value is set, false otherwise
*/
public function hasParameter($name)
{
@@ -306,10 +351,14 @@ public function hasParameter($name)
* @param string $name A parameter name
* @param mixed $parameter The parameter value
*
+ * @return RequestContext The current instance, implementing a fluent interface
+ *
* @api
*/
public function setParameter($name, $parameter)
{
$this->parameters[$name] = $parameter;
+
+ return $this;
}
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php
index ad8ec49b206cc093dd9eb93bea0f7a7b6c887db2..28966945d695b41dd4bc96d8169f14e4a91ac840 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php
@@ -61,6 +61,9 @@ class Route implements \Serializable
*/
private $compiled;
+ /**
+ * @var string
+ */
private $condition;
/**
@@ -99,23 +102,30 @@ public function __construct($path, array $defaults = array(), array $requirement
$this->setCondition($condition);
}
+ /**
+ * {@inheritdoc}
+ */
public function serialize()
{
return serialize(array(
- 'path' => $this->path,
- 'host' => $this->host,
- 'defaults' => $this->defaults,
+ 'path' => $this->path,
+ 'host' => $this->host,
+ 'defaults' => $this->defaults,
'requirements' => $this->requirements,
- 'options' => $this->options,
- 'schemes' => $this->schemes,
- 'methods' => $this->methods,
- 'condition' => $this->condition,
+ 'options' => $this->options,
+ 'schemes' => $this->schemes,
+ 'methods' => $this->methods,
+ 'condition' => $this->condition,
+ 'compiled' => $this->compiled,
));
}
- public function unserialize($data)
+ /**
+ * {@inheritdoc}
+ */
+ public function unserialize($serialized)
{
- $data = unserialize($data);
+ $data = unserialize($serialized);
$this->path = $data['path'];
$this->host = $data['host'];
$this->defaults = $data['defaults'];
@@ -123,7 +133,13 @@ public function unserialize($data)
$this->options = $data['options'];
$this->schemes = $data['schemes'];
$this->methods = $data['methods'];
- $this->condition = $data['condition'];
+
+ if (isset($data['condition'])) {
+ $this->condition = $data['condition'];
+ }
+ if (isset($data['compiled'])) {
+ $this->compiled = $data['compiled'];
+ }
}
/**
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php
index 9234b42b345b0e5a8b4ce52cb8db9e5197cef3a5..095145fd7cfc2afb1bf17a1593758f940eeb64b3 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php
@@ -37,12 +37,8 @@ class RouteCompiler implements RouteCompilerInterface
*/
public static function compile(Route $route)
{
- $staticPrefix = null;
$hostVariables = array();
- $pathVariables = array();
$variables = array();
- $tokens = array();
- $regex = null;
$hostRegex = null;
$hostTokens = array();
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php
index 62abec387245f5694a20230c662ee39b55dce986..f27437309294e209e2f5718a0ec5e5538df11040 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php
@@ -21,6 +21,8 @@
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
use Symfony\Component\Routing\Matcher\Dumper\MatcherDumperInterface;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
/**
* The Router class is an example of the integration of all pieces of the
@@ -70,6 +72,11 @@ class Router implements RouterInterface, RequestMatcherInterface
*/
protected $logger;
+ /**
+ * @var ExpressionFunctionProviderInterface[]
+ */
+ private $expressionLanguageProviders = array();
+
/**
* Constructor.
*
@@ -104,18 +111,18 @@ public function __construct(LoaderInterface $loader, $resource, array $options =
public function setOptions(array $options)
{
$this->options = array(
- 'cache_dir' => null,
- 'debug' => false,
- 'generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
- 'generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+ 'cache_dir' => null,
+ 'debug' => false,
+ 'generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+ 'generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
'generator_dumper_class' => 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper',
- 'generator_cache_class' => 'ProjectUrlGenerator',
- 'matcher_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
- 'matcher_base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
- 'matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper',
- 'matcher_cache_class' => 'ProjectUrlMatcher',
- 'resource_type' => null,
- 'strict_requirements' => true,
+ 'generator_cache_class' => 'ProjectUrlGenerator',
+ 'matcher_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
+ 'matcher_base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
+ 'matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper',
+ 'matcher_cache_class' => 'ProjectUrlMatcher',
+ 'resource_type' => null,
+ 'strict_requirements' => true,
);
// check option names and live merge, if errors are encountered Exception will be thrown
@@ -245,16 +252,28 @@ public function getMatcher()
}
if (null === $this->options['cache_dir'] || null === $this->options['matcher_cache_class']) {
- return $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context);
+ $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context);
+ if (method_exists($this->matcher, 'addExpressionLanguageProvider')) {
+ foreach ($this->expressionLanguageProviders as $provider) {
+ $this->matcher->addExpressionLanguageProvider($provider);
+ }
+ }
+
+ return $this->matcher;
}
$class = $this->options['matcher_cache_class'];
$cache = new ConfigCache($this->options['cache_dir'].'/'.$class.'.php', $this->options['debug']);
if (!$cache->isFresh()) {
$dumper = $this->getMatcherDumperInstance();
+ if (method_exists($dumper, 'addExpressionLanguageProvider')) {
+ foreach ($this->expressionLanguageProviders as $provider) {
+ $dumper->addExpressionLanguageProvider($provider);
+ }
+ }
$options = array(
- 'class' => $class,
+ 'class' => $class,
'base_class' => $this->options['matcher_base_class'],
);
@@ -286,7 +305,7 @@ public function getGenerator()
$dumper = $this->getGeneratorDumperInstance();
$options = array(
- 'class' => $class,
+ 'class' => $class,
'base_class' => $this->options['generator_base_class'],
);
@@ -305,6 +324,11 @@ public function getGenerator()
return $this->generator;
}
+ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
+ {
+ $this->expressionLanguageProviders[] = $provider;
+ }
+
/**
* @return GeneratorDumperInterface
*/
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
index e95c1f266bf260455af424fc58b27c422ef84aae..15937bcf02d16ebe7041163e2d8fd40b7efd7835 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
@@ -23,8 +23,8 @@ public function redirect($path, $route, $scheme = null)
{
return array(
'_controller' => 'Some controller reference...',
- 'path' => $path,
- 'scheme' => $scheme,
+ 'path' => $path,
+ 'scheme' => $scheme,
);
}
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validresource.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validresource.php
new file mode 100644
index 0000000000000000000000000000000000000000..482c80b29e919e0d06c4ef62e7e65e376b955302
--- /dev/null
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validresource.php
@@ -0,0 +1,18 @@
+<?php
+
+/** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
+/** @var \Symfony\Component\Routing\RouteCollection $collection */
+$collection = $loader->import('validpattern.php');
+$collection->addDefaults(array(
+ 'foo' => 123,
+));
+$collection->addRequirements(array(
+ 'foo' => '\d+',
+));
+$collection->addOptions(array(
+ 'foo' => 'bar',
+));
+$collection->setCondition('context.getMethod() == "POST"');
+$collection->addPrefix('/prefix');
+
+return $collection;
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/with_define_path_variable.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/with_define_path_variable.php
new file mode 100644
index 0000000000000000000000000000000000000000..5871420b154678c2d64c43c7e6fe7b55ce5f7a40
--- /dev/null
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/with_define_path_variable.php
@@ -0,0 +1,5 @@
+<?php
+
+$path = '/1/2/3';
+
+return new \Symfony\Component\Routing\RouteCollection();
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
index 4165741b06b0f60b95c0d2e1bcf0821e1feeca2d..170c5b4dcf69c7f0681f84b64f77d66e1c3ded5b 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -64,9 +64,9 @@ public function testDumpWithRoutes()
$projectUrlGenerator = new \ProjectUrlGenerator(new RequestContext('/app.php'));
- $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), true);
+ $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), true);
$absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), true);
- $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), false);
+ $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), false);
$relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), false);
$this->assertEquals($absoluteUrlWithParameter, 'http://localhost/app.php/testing/bar');
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
index 52b61d7d7e277d6b9088803741d47a1e877f4ee1..516b3ca6983a1c4c795b2f2d8f3aa7c786554d43 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -331,7 +331,7 @@ public function testUrlEncoding()
$routes = $this->getRoutes('test', new Route("/$chars/{varpath}", array(), array('varpath' => '.+')));
$this->assertSame('/app.php/@:%5B%5D/%28%29*%27%22%20+,;-._~%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id'
.'/@:%5B%5D/%28%29*%27%22%20+,;-._~%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id'
- .'?query=%40%3A%5B%5D%2F%28%29%2A%27%22+%2B%2C%3B-._%7E%26%24%3C%3E%7C%7B%7D%25%5C%5E%60%21%3Ffoo%3Dbar%23id',
+ .'?query=%40%3A%5B%5D/%28%29%2A%27%22+%2B%2C%3B-._%7E%26%24%3C%3E%7C%7B%7D%25%5C%5E%60%21%3Ffoo%3Dbar%23id',
$this->getGenerator($routes)->generate('test', array(
'varpath' => $chars,
'query' => $chars,
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
index 65d325c2d26b904a0069273946d99243285b6419..624394bb06ab53033d977e021478eafa48fa5e97 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -100,14 +100,14 @@ public function getLoadTests()
public function testLoad($className, $routeDatas = array(), $methodArgs = array())
{
$routeDatas = array_replace(array(
- 'name' => 'route',
- 'path' => '/',
+ 'name' => 'route',
+ 'path' => '/',
'requirements' => array(),
- 'options' => array(),
- 'defaults' => array(),
- 'schemes' => array(),
- 'methods' => array(),
- 'condition' => null,
+ 'options' => array(),
+ 'defaults' => array(),
+ 'schemes' => array(),
+ 'methods' => array(),
+ 'condition' => null,
), $routeDatas);
$this->reader
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
index bf76d3465b9aee290a11238bb08d0959db2060b5..8e2d98499d4780ff46dbdc0e726e1061875cdb7b 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
@@ -45,4 +45,38 @@ public function testLoadWithRoute()
$this->assertEquals(array('https'), $route->getSchemes());
}
}
+
+ public function testLoadWithImport()
+ {
+ $loader = new PhpFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+ $routeCollection = $loader->load('validresource.php');
+ $routes = $routeCollection->all();
+
+ $this->assertCount(2, $routes, 'Two routes are loaded');
+ $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+ foreach ($routes as $route) {
+ $this->assertSame('/prefix/blog/{slug}', $route->getPath());
+ $this->assertSame('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
+ $this->assertSame('{locale}.example.com', $route->getHost());
+ $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
+ $this->assertEquals(array('GET', 'POST', 'PUT', 'OPTIONS'), $route->getMethods());
+ $this->assertEquals(array('https'), $route->getSchemes());
+ }
+ }
+
+ public function testThatDefiningVariableInConfigFileHasNoSideEffects()
+ {
+ $locator = new FileLocator(array(__DIR__.'/../Fixtures'));
+ $loader = new PhpFileLoader($locator);
+ $routeCollection = $loader->load('with_define_path_variable.php');
+ $resources = $routeCollection->getResources();
+ $this->assertCount(1, $resources);
+ $this->assertContainsOnly('Symfony\Component\Config\Resource\ResourceInterface', $resources);
+ $fileResource = reset($resources);
+ $this->assertSame(
+ realpath($locator->locate('with_define_path_variable.php')),
+ (string) $fileResource
+ );
+ }
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RequestContextTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RequestContextTest.php
index 21a299956f8e520b12a36bf695ac28d50d8c777a..58612683ef136e0054b9ac86bd12502e41adda99 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RequestContextTest.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RequestContextTest.php
@@ -98,4 +98,62 @@ public function testSetParameter()
$this->assertEquals('bar', $requestContext->getParameter('foo'));
}
+
+ public function testMethod()
+ {
+ $requestContext = new RequestContext();
+ $requestContext->setMethod('post');
+
+ $this->assertSame('POST', $requestContext->getMethod());
+ }
+
+ public function testScheme()
+ {
+ $requestContext = new RequestContext();
+ $requestContext->setScheme('HTTPS');
+
+ $this->assertSame('https', $requestContext->getScheme());
+ }
+
+ public function testHost()
+ {
+ $requestContext = new RequestContext();
+ $requestContext->setHost('eXampLe.com');
+
+ $this->assertSame('example.com', $requestContext->getHost());
+ }
+
+ public function testQueryString()
+ {
+ $requestContext = new RequestContext();
+ $requestContext->setQueryString(null);
+
+ $this->assertSame('', $requestContext->getQueryString());
+ }
+
+ public function testPort()
+ {
+ $requestContext = new RequestContext();
+ $requestContext->setHttpPort('123');
+ $requestContext->setHttpsPort('456');
+
+ $this->assertSame(123, $requestContext->getHttpPort());
+ $this->assertSame(456, $requestContext->getHttpsPort());
+ }
+
+ public function testFluentInterface()
+ {
+ $requestContext = new RequestContext();
+
+ $this->assertSame($requestContext, $requestContext->setBaseUrl('/app.php'));
+ $this->assertSame($requestContext, $requestContext->setPathInfo('/index'));
+ $this->assertSame($requestContext, $requestContext->setMethod('POST'));
+ $this->assertSame($requestContext, $requestContext->setScheme('https'));
+ $this->assertSame($requestContext, $requestContext->setHost('example.com'));
+ $this->assertSame($requestContext, $requestContext->setQueryString('foo=bar'));
+ $this->assertSame($requestContext, $requestContext->setHttpPort(80));
+ $this->assertSame($requestContext, $requestContext->setHttpsPort(443));
+ $this->assertSame($requestContext, $requestContext->setParameters(array()));
+ $this->assertSame($requestContext, $requestContext->setParameter('foo', 'bar'));
+ }
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php
index 7ff4135583fc5d2418f2a7bc9170667bbf7e1b08..f667c0bad83ddce64932b118cd07f8c484f8583d 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php
@@ -53,7 +53,7 @@ public function testOptions()
$route = new Route('/{foo}');
$route->setOptions(array('foo' => 'bar'));
$this->assertEquals(array_merge(array(
- 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler',
+ 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler',
), array('foo' => 'bar')), $route->getOptions(), '->setOptions() sets the options');
$this->assertEquals($route, $route->setOptions(array()), '->setOptions() implements a fluent interface');
@@ -229,7 +229,7 @@ public function testPattern()
public function testSerialize()
{
- $route = new Route('/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
+ $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
$serialized = serialize($route);
$unserialized = unserialize($serialized);
@@ -237,4 +237,39 @@ public function testSerialize()
$this->assertEquals($route, $unserialized);
$this->assertNotSame($route, $unserialized);
}
+
+ /**
+ * Tests that the compiled version is also serialized to prevent the overhead
+ * of compiling it again after unserialize.
+ */
+ public function testSerializeWhenCompiled()
+ {
+ $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
+ $route->setHost('{locale}.example.net');
+ $route->compile();
+
+ $serialized = serialize($route);
+ $unserialized = unserialize($serialized);
+
+ $this->assertEquals($route, $unserialized);
+ $this->assertNotSame($route, $unserialized);
+ }
+
+ /**
+ * Tests that the serialized representation of a route in one symfony version
+ * also works in later symfony versions, i.e. the unserialized route is in the
+ * same state as another, semantically equivalent, route.
+ */
+ public function testSerializedRepresentationKeepsWorking()
+ {
+ $serialized = 'C:31:"Symfony\Component\Routing\Route":933:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":568:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:30:"#^/prefix(?:/(?P<foo>\d+))?$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:38:"#^(?P<locale>[^\.]++)\.example\.net$#s";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
+ $unserialized = unserialize($serialized);
+
+ $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
+ $route->setHost('{locale}.example.net');
+ $route->compile();
+
+ $this->assertEquals($route, $unserialized);
+ $this->assertNotSame($route, $unserialized);
+ }
}
diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json b/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json
index b4c04b6a1e66a776a87ba296a2751a31bba76903..609fae9caa878ac94db74cbb92945a684ad1cd1c 100644
--- a/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json
+++ b/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json
@@ -39,7 +39,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md b/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md
index d5502b062f470c9941186af0fae576885eaea3b5..2f7310fd516ac6adb4fdcde84569f4d3d2a4b39a 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md
@@ -1,6 +1,12 @@
CHANGELOG
=========
+2.6.0
+-----
+
+ * added a new serializer: `PropertyNormalizer`. Like `GetSetMethodNormalizer`,
+ this normalizer will map an object's properties to an array.
+
2.5.0
-----
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainDecoder.php
index 5321a234057ecabb33cd7847927f6c5e23790461..f8f17b4f723e665de419ccb50c619677516c8366 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainDecoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -58,6 +58,7 @@ public function supportsDecoding($format)
* @param string $format
*
* @return DecoderInterface
+ *
* @throws RuntimeException if no decoder is found
*/
private function getDecoder($format)
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php
index 43dfa001189144881905a52b5d90b3ec3a07f934..5ee352ab27932546b89aaf54802576cbecda4fec 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -80,6 +80,7 @@ public function needsNormalization($format)
* @param string $format
*
* @return EncoderInterface
+ *
* @throws RuntimeException if no encoder is found
*/
private function getEncoder($format)
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php
index 34e21bc0e3beebbea2b9c2fc6cd42aa5b85ce236..683da5bec92a71533e88c3fd8374eac6ca4a5233 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php
@@ -14,7 +14,7 @@
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
/**
- * Defines the interface of decoders
+ * Defines the interface of decoders.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
@@ -23,9 +23,9 @@ interface DecoderInterface
/**
* Decodes a string into PHP data.
*
- * @param scalar $data Data to decode
- * @param string $format Format name
- * @param array $context options that decoders have access to.
+ * @param scalar $data Data to decode
+ * @param string $format Format name
+ * @param array $context options that decoders have access to.
*
* The format parameter specifies which format the data is in; valid values
* depend on the specific implementation. Authors implementing this interface
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php
index 394df9999fb2d7297799eb19f8fd6eaa2924f966..fe7e777daad32f70f829d3b7877c3af494e54d60 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php
@@ -14,17 +14,17 @@
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
/**
- * Defines the interface of encoders
+ * Defines the interface of encoders.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
interface EncoderInterface
{
/**
- * Encodes data into the given format
+ * Encodes data into the given format.
*
- * @param mixed $data Data to encode
- * @param string $format Format name
+ * @param mixed $data Data to encode
+ * @param string $format Format name
* @param array $context options that normalizers/encoders have access to.
*
* @return scalar
@@ -34,7 +34,7 @@ interface EncoderInterface
public function encode($data, $format, array $context = array());
/**
- * Checks whether the serializer can encode to given format
+ * Checks whether the serializer can encode to given format.
*
* @param string $format format name
*
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php
index afb4e3ec843327951be55b21618b4f2d7a9058e6..c1c625b431d387653e164990cea5a2c4f6357f63 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -41,8 +41,8 @@ class JsonDecode implements DecoderInterface
/**
* Constructs a new JsonDecode instance.
*
- * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy
- * @param int $depth Specifies the recursion depth
+ * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy
+ * @param int $depth Specifies the recursion depth
*/
public function __construct($associative = false, $depth = 512)
{
@@ -95,9 +95,9 @@ public function decode($data, $format, array $context = array())
{
$context = $this->resolveContext($context);
- $associative = $context['json_decode_associative'];
+ $associative = $context['json_decode_associative'];
$recursionDepth = $context['json_decode_recursion_depth'];
- $options = $context['json_decode_options'];
+ $options = $context['json_decode_options'];
if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
$decodedData = json_decode($data, $associative, $recursionDepth, $options);
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php
index 8b468bd14a87432a3cea5df968ec2188885036c5..ff377db9939b6b36b81d479aa88bfcf467571b4c 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -14,7 +14,7 @@
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
/**
- * Encodes JSON data
+ * Encodes JSON data.
*
* @author Sander Coolen <sander@jibber.nl>
*/
@@ -43,7 +43,7 @@ public function getLastError()
}
/**
- * Encodes PHP data to a JSON string
+ * Encodes PHP data to a JSON string.
*
* {@inheritdoc}
*/
@@ -72,6 +72,7 @@ public function supportsEncoding($format)
* Merge default json encode options with context.
*
* @param array $context
+ *
* @return array
*/
private function resolveContext(array $context = array())
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php
index 9137c926b30d95064bf1472bf98d5ad622010269..df22316ff703da833523e81be5426e9b91c936d5 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php
@@ -37,7 +37,7 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
}
/**
- * Returns the last encoding error (if any)
+ * Returns the last encoding error (if any).
*
* @return int
*
@@ -49,7 +49,7 @@ public function getLastEncodingError()
}
/**
- * Returns the last decoding error (if any)
+ * Returns the last decoding error (if any).
*
* @return int
*
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php
index 8101332e5ba15bdb2d4b3b14a67b412d2b5ed7b7..c066bd7cdd1bb73d28467cd5d53a6f764a0afeaf 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\Serializer\Encoder;
/**
- * Defines the interface of encoders that will normalize data themselves
+ * Defines the interface of encoders that will normalize data themselves.
*
* Implementing this interface essentially just tells the Serializer that the
* data should not be pre-normalized before being passed to this Encoder.
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/SerializerAwareEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/SerializerAwareEncoder.php
index 80bbb23d75ec173decddfc32e9cc3a6ebac3f1a1..a3d8ff38c347d7e52ad86072554725e5053adb41 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/SerializerAwareEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/SerializerAwareEncoder.php
@@ -15,7 +15,7 @@
use Symfony\Component\Serializer\SerializerAwareInterface;
/**
- * SerializerAware Encoder implementation
+ * SerializerAware Encoder implementation.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 8c47e418a58d1b9dfc195e75c2a1349c836007fb..709b8b65c3ad90fe8b67e990d1305c9a77a9d3bf 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -14,7 +14,7 @@
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
/**
- * Encodes XML data
+ * Encodes XML data.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
* @author John Wards <jwards@whiteoctober.co.uk>
@@ -99,7 +99,19 @@ public function decode($data, $format, array $context = array())
// todo: throw an exception if the root node name is not correctly configured (bc)
if ($rootNode->hasChildNodes()) {
- return $this->parseXml($rootNode);
+ $xpath = new \DOMXPath($dom);
+ $data = array();
+ foreach ($xpath->query('namespace::*', $dom->documentElement) as $nsNode) {
+ $data['@'.$nsNode->nodeName] = $nsNode->nodeValue;
+ }
+
+ unset($data['@xmlns:xml']);
+
+ if (empty($data)) {
+ return $this->parseXml($rootNode);
+ }
+
+ return array_merge($data, (array) $this->parseXml($rootNode));
}
if (!$rootNode->hasAttributes()) {
@@ -134,7 +146,7 @@ public function supportsDecoding($format)
}
/**
- * Sets the root node name
+ * Sets the root node name.
*
* @param string $name root node name
*/
@@ -144,7 +156,8 @@ public function setRootNodeName($name)
}
/**
- * Returns the root node name
+ * Returns the root node name.
+ *
* @return string
*/
public function getRootNodeName()
@@ -217,7 +230,7 @@ final protected function appendDocumentFragment(\DOMNode $node, $fragment)
}
/**
- * Checks the name is a valid xml element name
+ * Checks the name is a valid xml element name.
*
* @param string $name
*
@@ -227,7 +240,7 @@ final protected function isElementNameValid($name)
{
return $name &&
false === strpos($name, ' ') &&
- preg_match('#^[\pL_][\pL0-9._-]*$#ui', $name);
+ preg_match('#^[\pL_][\pL0-9._:-]*$#ui', $name);
}
/**
@@ -267,7 +280,7 @@ private function parseXml(\DOMNode $node)
}
/**
- * Parse the input DOMNode attributes into an array
+ * Parse the input DOMNode attributes into an array.
*
* @param \DOMNode $node xml to parse
*
@@ -281,11 +294,11 @@ private function parseXmlAttributes(\DOMNode $node)
$data = array();
- foreach ($node->attributes as $attrkey => $attr) {
+ foreach ($node->attributes as $attr) {
if (ctype_digit($attr->nodeValue)) {
- $data['@'.$attrkey] = (int) $attr->nodeValue;
+ $data['@'.$attr->nodeName] = (int) $attr->nodeValue;
} else {
- $data['@'.$attrkey] = $attr->nodeValue;
+ $data['@'.$attr->nodeName] = $attr->nodeValue;
}
}
@@ -293,7 +306,7 @@ private function parseXmlAttributes(\DOMNode $node)
}
/**
- * Parse the input DOMNode value (content and children) into an array or a string
+ * Parse the input DOMNode value (content and children) into an array or a string.
*
* @param \DOMNode $node xml to parse
*
@@ -335,7 +348,7 @@ private function parseXmlValue(\DOMNode $node)
}
/**
- * Parse the data and convert it to DOMElements
+ * Parse the data and convert it to DOMElements.
*
* @param \DOMNode $parentNode
* @param array|object $data
@@ -440,7 +453,7 @@ private function needsCdataWrapping($val)
}
/**
- * Tests the value being passed and decide what sort of element to create
+ * Tests the value being passed and decide what sort of element to create.
*
* @param \DOMNode $node
* @param mixed $val
@@ -476,6 +489,10 @@ private function selectNodeType(\DOMNode $node, $val)
/**
* Get real XML root node name, taking serializer options into account.
+ *
+ * @param array $context
+ *
+ * @return string
*/
private function resolveXmlRootName(array $context = array())
{
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Exception/ExceptionInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Exception/CircularReferenceException.php
similarity index 57%
rename from core/vendor/symfony/process/Symfony/Component/Process/Exception/ExceptionInterface.php
rename to core/vendor/symfony/serializer/Symfony/Component/Serializer/Exception/CircularReferenceException.php
index 75c1c9e5d800500d07f2790f21eb45a26439f3cd..b2977b970608ae4ae2c2a2a5e4c1e0b16d5b00d2 100644
--- a/core/vendor/symfony/process/Symfony/Component/Process/Exception/ExceptionInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Exception/CircularReferenceException.php
@@ -9,13 +9,13 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Process\Exception;
+namespace Symfony\Component\Serializer\Exception;
/**
- * Marker Interface for the Process Component.
+ * CircularReferenceException
*
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ * @author Kévin Dunglas <dunglas@gmail.com>
*/
-interface ExceptionInterface
+class CircularReferenceException extends RuntimeException
{
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
index 5a1b4c196b59418e709fa20c9020e51456d4f2a3..419d793f509504f1e1f497bfdaddbf56820be3a6 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\Serializer\Normalizer;
/**
- * Defines the most basic interface a class must implement to be denormalizable
+ * Defines the most basic interface a class must implement to be denormalizable.
*
* If a denormalizer is registered for the class and it doesn't implement
* the Denormalizable interfaces, the normalizer will be used instead
@@ -28,11 +28,11 @@ interface DenormalizableInterface
* recursively all child objects of the implementor.
*
* @param DenormalizerInterface $denormalizer The denormalizer is given so that you
- * can use it to denormalize objects contained within this object.
- * @param array|scalar $data The data from which to re-create the object.
- * @param string|null $format The format is optionally given to be able to denormalize differently
- * based on different input formats.
- * @param array $context options for denormalizing
+ * can use it to denormalize objects contained within this object.
+ * @param array|scalar $data The data from which to re-create the object.
+ * @param string|null $format The format is optionally given to be able to denormalize differently
+ * based on different input formats.
+ * @param array $context options for denormalizing.
*/
public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
index 001dd6863dcf65787ee793ab34d793c84c518934..8b6c2333958fe157f8b2bc67cba932765aeb5fa4 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -19,11 +19,11 @@
interface DenormalizerInterface
{
/**
- * Denormalizes data back into an object of the given class
+ * Denormalizes data back into an object of the given class.
*
- * @param mixed $data data to restore
- * @param string $class the expected class to instantiate
- * @param string $format format the given data was extracted from
+ * @param mixed $data data to restore
+ * @param string $class the expected class to instantiate
+ * @param string $format format the given data was extracted from
* @param array $context options available to the denormalizer
*
* @return object
@@ -31,7 +31,7 @@ interface DenormalizerInterface
public function denormalize($data, $class, $format = null, array $context = array());
/**
- * Checks whether the given class is supported for denormalization by this normalizer
+ * Checks whether the given class is supported for denormalization by this normalizer.
*
* @param mixed $data Data to denormalize from.
* @param string $type The class to which the data should be denormalized.
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index f4a1b9094bbddedfb7dad00026511ef42d3194e5..b15eefc6e487a809e053bd5e7f0584bbc5b664d2 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Serializer\Normalizer;
+use Symfony\Component\Serializer\Exception\CircularReferenceException;
use Symfony\Component\Serializer\Exception\InvalidArgumentException;
use Symfony\Component\Serializer\Exception\RuntimeException;
@@ -33,13 +34,50 @@
* takes place.
*
* @author Nils Adermann <naderman@naderman.de>
+ * @author Kévin Dunglas <dunglas@gmail.com>
*/
class GetSetMethodNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface
{
+ protected $circularReferenceLimit = 1;
+ protected $circularReferenceHandler;
protected $callbacks = array();
protected $ignoredAttributes = array();
protected $camelizedAttributes = array();
+ /**
+ * Set circular reference limit.
+ *
+ * @param $circularReferenceLimit limit of iterations for the same object
+ *
+ * @return self
+ */
+ public function setCircularReferenceLimit($circularReferenceLimit)
+ {
+ $this->circularReferenceLimit = $circularReferenceLimit;
+
+ return $this;
+ }
+
+ /**
+ * Set circular reference handler.
+ *
+ * @param callable $circularReferenceHandler
+ *
+ * @return self
+ *
+ * @throws InvalidArgumentException
+ */
+ public function setCircularReferenceHandler($circularReferenceHandler)
+ {
+ if (!is_callable($circularReferenceHandler)) {
+ throw new InvalidArgumentException('The given circular reference handler is not callable.');
+ }
+
+ $this->circularReferenceHandler = $circularReferenceHandler;
+
+ return $this;
+ }
+
/**
* Set normalization callbacks.
*
@@ -47,7 +85,7 @@ class GetSetMethodNormalizer extends SerializerAwareNormalizer implements Normal
*
* @throws InvalidArgumentException if a non-callable callback is set
*
- * @return GetSetMethodNormalizer
+ * @return self
*/
public function setCallbacks(array $callbacks)
{
@@ -62,11 +100,11 @@ public function setCallbacks(array $callbacks)
}
/**
- * Set ignored attributes for normalization
+ * Set ignored attributes for normalization.
*
* @param array $ignoredAttributes
*
- * @return GetSetMethodNormalizer
+ * @return self
*/
public function setIgnoredAttributes(array $ignoredAttributes)
{
@@ -76,11 +114,11 @@ public function setIgnoredAttributes(array $ignoredAttributes)
}
/**
- * Set attributes to be camelized on denormalize
+ * Set attributes to be camelized on denormalize.
*
* @param array $camelizedAttributes
*
- * @return GetSetMethodNormalizer
+ * @return self
*/
public function setCamelizedAttributes(array $camelizedAttributes)
{
@@ -94,6 +132,24 @@ public function setCamelizedAttributes(array $camelizedAttributes)
*/
public function normalize($object, $format = null, array $context = array())
{
+ $objectHash = spl_object_hash($object);
+
+ if (isset($context['circular_reference_limit'][$objectHash])) {
+ if ($context['circular_reference_limit'][$objectHash] >= $this->circularReferenceLimit) {
+ unset($context['circular_reference_limit'][$objectHash]);
+
+ if ($this->circularReferenceHandler) {
+ return call_user_func($this->circularReferenceHandler, $object);
+ }
+
+ throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));
+ }
+
+ $context['circular_reference_limit'][$objectHash]++;
+ } else {
+ $context['circular_reference_limit'][$objectHash] = 1;
+ }
+
$reflectionObject = new \ReflectionObject($object);
$reflectionMethods = $reflectionObject->getMethods(\ReflectionMethod::IS_PUBLIC);
@@ -114,7 +170,8 @@ public function normalize($object, $format = null, array $context = array())
if (!$this->serializer instanceof NormalizerInterface) {
throw new \LogicException(sprintf('Cannot normalize attribute "%s" because injected serializer is not a normalizer', $attributeName));
}
- $attributeValue = $this->serializer->normalize($attributeValue, $format);
+
+ $attributeValue = $this->serializer->normalize($attributeValue, $format, $context);
}
$attributes[$attributeName] = $attributeValue;
@@ -185,9 +242,10 @@ public function denormalize($data, $class, $format = null, array $context = arra
/**
* Format attribute name to access parameters or methods
* As option, if attribute name is found on camelizedAttributes array
- * returns attribute name in camelcase format
+ * returns attribute name in camelcase format.
*
* @param string $attributeName
+ *
* @return string
*/
protected function formatAttribute($attributeName)
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
index 07c3a4a8dd8e81011ed325124b54dc6df47bff0e..e19fe5ce58576cb2c2829d6667344fb411ff18dc 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -12,10 +12,10 @@
namespace Symfony\Component\Serializer\Normalizer;
/**
- * Defines the most basic interface a class must implement to be normalizable
+ * Defines the most basic interface a class must implement to be normalizable.
*
* If a normalizer is registered for the class and it doesn't implement
- * the Normalizable interfaces, the normalizer will be used instead
+ * the Normalizable interfaces, the normalizer will be used instead.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
@@ -28,10 +28,10 @@ interface NormalizableInterface
* recursively all child objects of the implementor.
*
* @param NormalizerInterface $normalizer The normalizer is given so that you
- * can use it to normalize objects contained within this object.
- * @param string|null $format The format is optionally given to be able to normalize differently
- * based on different output formats.
- * @param array $context Options for normalizing this object
+ * can use it to normalize objects contained within this object.
+ * @param string|null $format The format is optionally given to be able to normalize differently
+ * based on different output formats.
+ * @param array $context Options for normalizing this object
*
* @return array|scalar
*/
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index 22a95438a098e84d3df6ba817ccba70086594cfd..f4bd355232b0b06c01a9668913e4716fb864e990 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -19,18 +19,18 @@
interface NormalizerInterface
{
/**
- * Normalizes an object into a set of arrays/scalars
+ * Normalizes an object into a set of arrays/scalars.
*
- * @param object $object object to normalize
- * @param string $format format the normalization result will be encoded as
- * @param array $context Context options for the normalizer
+ * @param object $object object to normalize
+ * @param string $format format the normalization result will be encoded as
+ * @param array $context Context options for the normalizer
*
* @return array|scalar
*/
public function normalize($object, $format = null, array $context = array());
/**
- * Checks whether the given class is supported for normalization by this normalizer
+ * Checks whether the given class is supported for normalization by this normalizer.
*
* @param mixed $data Data to normalize.
* @param string $format The format being (de-)serialized from or into.
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
new file mode 100644
index 0000000000000000000000000000000000000000..428af1a9dccd591b1110c8009558c8a69289172f
--- /dev/null
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -0,0 +1,218 @@
+<?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\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\RuntimeException;
+
+/**
+ * Converts between objects and arrays by mapping properties.
+ *
+ * The normalization process looks for all the object's properties (public and private).
+ * The result is a map from property names to property values. Property values
+ * are normalized through the serializer.
+ *
+ * The denormalization first looks at the constructor of the given class to see
+ * if any of the parameters have the same name as one of the properties. The
+ * constructor is then called with all parameters or an exception is thrown if
+ * any required parameters were not present as properties. Then the denormalizer
+ * walks through the given map of property names to property values to see if a
+ * property with the corresponding name exists. If found, the property gets the value.
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+class PropertyNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+ private $callbacks = array();
+ private $ignoredAttributes = array();
+ private $camelizedAttributes = array();
+
+ /**
+ * Set normalization callbacks
+ *
+ * @param array $callbacks help normalize the result
+ *
+ * @throws InvalidArgumentException if a non-callable callback is set
+ */
+ public function setCallbacks(array $callbacks)
+ {
+ foreach ($callbacks as $attribute => $callback) {
+ if (!is_callable($callback)) {
+ throw new InvalidArgumentException(sprintf(
+ 'The given callback for attribute "%s" is not callable.',
+ $attribute
+ ));
+ }
+ }
+ $this->callbacks = $callbacks;
+ }
+
+ /**
+ * Set ignored attributes for normalization.
+ *
+ * @param array $ignoredAttributes
+ */
+ public function setIgnoredAttributes(array $ignoredAttributes)
+ {
+ $this->ignoredAttributes = $ignoredAttributes;
+ }
+
+ /**
+ * Set attributes to be camelized on denormalize
+ *
+ * @param array $camelizedAttributes
+ */
+ public function setCamelizedAttributes(array $camelizedAttributes)
+ {
+ $this->camelizedAttributes = $camelizedAttributes;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function normalize($object, $format = null, array $context = array())
+ {
+ $reflectionObject = new \ReflectionObject($object);
+ $attributes = array();
+
+ foreach ($reflectionObject->getProperties() as $property) {
+ if (in_array($property->name, $this->ignoredAttributes)) {
+ continue;
+ }
+
+ // Override visibility
+ if (! $property->isPublic()) {
+ $property->setAccessible(true);
+ }
+
+ $attributeValue = $property->getValue($object);
+
+ if (array_key_exists($property->name, $this->callbacks)) {
+ $attributeValue = call_user_func($this->callbacks[$property->name], $attributeValue);
+ }
+ if (null !== $attributeValue && !is_scalar($attributeValue)) {
+ $attributeValue = $this->serializer->normalize($attributeValue, $format);
+ }
+
+ $attributes[$property->name] = $attributeValue;
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function denormalize($data, $class, $format = null, array $context = array())
+ {
+ $reflectionClass = new \ReflectionClass($class);
+ $constructor = $reflectionClass->getConstructor();
+
+ if ($constructor) {
+ $constructorParameters = $constructor->getParameters();
+
+ $params = array();
+ foreach ($constructorParameters as $constructorParameter) {
+ $paramName = lcfirst($this->formatAttribute($constructorParameter->name));
+
+ if (isset($data[$paramName])) {
+ $params[] = $data[$paramName];
+ // don't run set for a parameter passed to the constructor
+ unset($data[$paramName]);
+ } elseif (!$constructorParameter->isOptional()) {
+ throw new RuntimeException(sprintf(
+ 'Cannot create an instance of %s from serialized data because '.
+ 'its constructor requires parameter "%s" to be present.',
+ $class,
+ $constructorParameter->name
+ ));
+ }
+ }
+
+ $object = $reflectionClass->newInstanceArgs($params);
+ } else {
+ $object = new $class();
+ }
+
+ foreach ($data as $propertyName => $value) {
+ $propertyName = lcfirst($this->formatAttribute($propertyName));
+
+ if ($reflectionClass->hasProperty($propertyName)) {
+ $property = $reflectionClass->getProperty($propertyName);
+
+ // Override visibility
+ if (! $property->isPublic()) {
+ $property->setAccessible(true);
+ }
+
+ $property->setValue($object, $value);
+ }
+ }
+
+ return $object;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function supportsNormalization($data, $format = null)
+ {
+ return is_object($data) && $this->supports(get_class($data));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function supportsDenormalization($data, $type, $format = null)
+ {
+ return $this->supports($type);
+ }
+
+ /**
+ * Format an attribute name, for example to convert a snake_case name to camelCase.
+ *
+ * @param string $attributeName
+ *
+ * @return string
+ */
+ protected function formatAttribute($attributeName)
+ {
+ if (in_array($attributeName, $this->camelizedAttributes)) {
+ return preg_replace_callback('/(^|_|\.)+(.)/', function ($match) {
+ return ('.' === $match[1] ? '_' : '').strtoupper($match[2]);
+ }, $attributeName);
+ }
+
+ return $attributeName;
+ }
+
+ /**
+ * Checks if the given class has any non-static property.
+ *
+ * @param string $class
+ *
+ * @return bool
+ */
+ private function supports($class)
+ {
+ $class = new \ReflectionClass($class);
+
+ // We look for at least one non-static property
+ foreach ($class->getProperties() as $property) {
+ if (! $property->isStatic()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/SerializerAwareNormalizer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/SerializerAwareNormalizer.php
index 49916bef4c657534c4e16b2db5d4da8bc6733cba..395685707405cc40fb929a759d11887b6c50ba6d 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/SerializerAwareNormalizer.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/SerializerAwareNormalizer.php
@@ -15,7 +15,7 @@
use Symfony\Component\Serializer\SerializerAwareInterface;
/**
- * SerializerAware Normalizer implementation
+ * SerializerAware Normalizer implementation.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php
index c4052bcbcc5ee7e2bd22dde87473dac300edc4a8..a1af359d150c43cdddd7991789c9ceb21bfa6cab 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php
@@ -21,10 +21,10 @@
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
/**
- * Serializer serializes and deserializes data
+ * Serializer serializes and deserializes data.
*
- * objects are turned into arrays by normalizers
- * arrays are turned into various output formats by encoders
+ * objects are turned into arrays by normalizers.
+ * arrays are turned into various output formats by encoders.
*
* $serializer->serialize($obj, 'xml')
* $serializer->decode($data, 'xml')
@@ -36,10 +36,25 @@
*/
class Serializer implements SerializerInterface, NormalizerInterface, DenormalizerInterface, EncoderInterface, DecoderInterface
{
+ /**
+ * @var Encoder\ChainEncoder
+ */
protected $encoder;
+ /**
+ * @var Encoder\ChainDecoder
+ */
protected $decoder;
- protected $normalizers = array();
- protected $normalizerCache = array();
+ /**
+ * @var array
+ */
+ protected $normalizers = array();
+ /**
+ * @var array
+ */
+ protected $normalizerCache = array();
+ /**
+ * @var array
+ */
protected $denormalizerCache = array();
public function __construct(array $normalizers = array(), array $encoders = array())
@@ -157,7 +172,7 @@ public function supportsDenormalization($data, $type, $format = null)
/**
* Returns a matching normalizer.
*
- * @param object $data The object to get the serializer for
+ * @param object $data The object to get the serializer for
* @param string $format format name, present to give the option to normalizers to act differently based on formats
*
* @return NormalizerInterface|null
@@ -219,11 +234,11 @@ final public function decode($data, $format, array $context = array())
}
/**
- * Normalizes an object into a set of arrays/scalars
+ * Normalizes an object into a set of arrays/scalars.
*
- * @param object $object object to normalize
- * @param string $format format name, present to give the option to normalizers to act differently based on formats
- * @param array $context The context data for this particular normalization
+ * @param object $object object to normalize
+ * @param string $format format name, present to give the option to normalizers to act differently based on formats
+ * @param array $context The context data for this particular normalization
*
* @return array|scalar
*
@@ -243,12 +258,12 @@ private function normalizeObject($object, $format, array $context = array())
}
/**
- * Denormalizes data back into an object of the given class
+ * Denormalizes data back into an object of the given class.
*
- * @param mixed $data data to restore
- * @param string $class the expected class to instantiate
- * @param string $format format name, present to give the option to normalizers to act differently based on formats
- * @param array $context The context data for this particular denormalization
+ * @param mixed $data data to restore
+ * @param string $class the expected class to instantiate
+ * @param string $format format name, present to give the option to normalizers to act differently based on formats
+ * @param array $context The context data for this particular denormalization
*
* @return object
*
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerAwareInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerAwareInterface.php
index ad0b768ccc8a2cdedf1c76358d78ffd9f1912e1b..dd0a62e7fa88735bd2b4f0ebecff67aeb640bb48 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerAwareInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerAwareInterface.php
@@ -12,14 +12,14 @@
namespace Symfony\Component\Serializer;
/**
- * Defines the interface of encoders
+ * Defines the interface of encoders.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
interface SerializerAwareInterface
{
/**
- * Sets the owning Serializer object
+ * Sets the owning Serializer object.
*
* @param SerializerInterface $serializer
*/
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerInterface.php
index d196d780a95be8ef55789cadeec0820523ea15bd..c79db91892075068a5d75ea69b6e191f86ab78d6 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/SerializerInterface.php
@@ -12,14 +12,14 @@
namespace Symfony\Component\Serializer;
/**
- * Defines the interface of the Serializer
+ * Defines the interface of the Serializer.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
interface SerializerInterface
{
/**
- * Serializes data in the appropriate format
+ * Serializes data in the appropriate format.
*
* @param mixed $data any data
* @param string $format format name
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index f0c7b17e743665ef7d3ff2df0ade6c4812a69bd5..85d0dc55915299cbb1a127f699e55f847ad77cfd 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -203,6 +203,14 @@ public function testEncode()
$this->assertEquals($source, $this->encoder->encode($obj, 'xml'));
}
+ public function testEncodeWithNamespace()
+ {
+ $source = $this->getNamespacedXmlSource();
+ $array = $this->getNamespacedArray();
+
+ $this->assertEquals($source, $this->encoder->encode($array, 'xml'));
+ }
+
public function testEncodeSerializerXmlRootNodeNameOption()
{
$options = array('xml_root_node_name' => 'test');
@@ -253,6 +261,14 @@ public function testDecodeCdataWrappingAndWhitespace()
$this->assertEquals($expected, $this->encoder->decode($xml, 'xml'));
}
+ public function testDecodeWithNamespace()
+ {
+ $source = $this->getNamespacedXmlSource();
+ $array = $this->getNamespacedArray();
+
+ $this->assertEquals($array, $this->encoder->decode($source, 'xml'));
+ }
+
public function testDecodeScalarWithAttribute()
{
$source = '<?xml version="1.0"?>'."\n".
@@ -312,6 +328,29 @@ public function testDecodeArray()
$this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
}
+ public function testDecodeIgnoreWhiteSpace()
+ {
+ $source = <<<XML
+<?xml version="1.0"?>
+<people>
+ <person>
+ <firstname>Benjamin</firstname>
+ <lastname>Alexandre</lastname>
+ </person>
+ <person>
+ <firstname>Damien</firstname>
+ <lastname>Clay</lastname>
+ </person>
+</people>
+XML;
+ $expected = array('person' => array(
+ array('firstname' => 'Benjamin', 'lastname' => 'Alexandre'),
+ array('firstname' => 'Damien', 'lastname' => 'Clay'),
+ ));
+
+ $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
+ }
+
public function testDecodeWithoutItemHash()
{
$obj = new ScalarDummy();
@@ -391,6 +430,53 @@ protected function getXmlSource()
'</response>'."\n";
}
+ protected function getNamespacedXmlSource()
+ {
+ return '<?xml version="1.0"?>'."\n".
+ '<response xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:media="http://search.yahoo.com/mrss/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:yt="http://gdata.youtube.com/schemas/2007">'.
+ '<qux>1</qux>'.
+ '<app:foo>foo</app:foo>'.
+ '<yt:bar>a</yt:bar><yt:bar>b</yt:bar>'.
+ '<media:baz><media:key>val</media:key><media:key2>val</media:key2><item key="A B">bar</item>'.
+ '<item><title>title1</title></item><item><title>title2</title></item>'.
+ '<Barry size="large"><FooBar gd:id="1"><Baz>Ed</Baz></FooBar></Barry></media:baz>'.
+ '</response>'."\n";
+ }
+
+ protected function getNamespacedArray()
+ {
+ return array(
+ '@xmlns' => 'http://www.w3.org/2005/Atom',
+ '@xmlns:app' => 'http://www.w3.org/2007/app',
+ '@xmlns:media' => 'http://search.yahoo.com/mrss/',
+ '@xmlns:gd' => 'http://schemas.google.com/g/2005',
+ '@xmlns:yt' => 'http://gdata.youtube.com/schemas/2007',
+ 'qux' => "1",
+ 'app:foo' => "foo",
+ 'yt:bar' => array("a", "b"),
+ 'media:baz' => array(
+ 'media:key' => "val",
+ 'media:key2' => "val",
+ 'A B' => "bar",
+ 'item' => array(
+ array(
+ 'title' => 'title1',
+ ),
+ array(
+ 'title' => 'title2',
+ ),
+ ),
+ 'Barry' => array(
+ '@size' => 'large',
+ 'FooBar' => array(
+ 'Baz' => 'Ed',
+ '@gd:id' => 1,
+ ),
+ ),
+ ),
+ );
+ }
+
protected function getObject()
{
$obj = new Dummy();
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessInSigchildEnvironment.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Fixtures/CircularReferenceDummy.php
similarity index 56%
rename from core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessInSigchildEnvironment.php
rename to core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Fixtures/CircularReferenceDummy.php
index 3977bcdcf1e8465e81eae0f8a2d312f970476d75..cc07015c34052bbf3b803799ec5d457e46bd1f8a 100644
--- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessInSigchildEnvironment.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Fixtures/CircularReferenceDummy.php
@@ -9,14 +9,15 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Process\Tests;
+namespace Symfony\Component\Serializer\Tests\Fixtures;
-use Symfony\Component\Process\Process;
-
-class ProcessInSigchildEnvironment extends Process
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class CircularReferenceDummy
{
- protected function isSigchildEnabled()
+ public function getMe()
{
- return true;
+ return $this;
}
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Fixtures/SiblingHolder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Fixtures/SiblingHolder.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2efd623dc67e03de11ba1b86913f6ffc4c1db51
--- /dev/null
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Fixtures/SiblingHolder.php
@@ -0,0 +1,56 @@
+<?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\Serializer\Tests\Fixtures;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class SiblingHolder
+{
+ private $sibling0;
+ private $sibling1;
+ private $sibling2;
+
+ public function __construct()
+ {
+ $sibling = new Sibling();
+ $this->sibling0 = $sibling;
+ $this->sibling1 = $sibling;
+ $this->sibling2 = $sibling;
+ }
+
+ public function getSibling0()
+ {
+ return $this->sibling0;
+ }
+
+ public function getSibling1()
+ {
+ return $this->sibling1;
+ }
+
+ public function getSibling2()
+ {
+ return $this->sibling2;
+ }
+}
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class Sibling
+{
+ public function getCoopTilleuls()
+ {
+ return 'Les-Tilleuls.coop';
+ }
+}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index cc8de241ca4a7c2cc642cd1e581553fa0c2bbcc8..fa59ca904e38c2f1250781b5eedc1960e44c9dcb 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -12,8 +12,11 @@
namespace Symfony\Component\Serializer\Tests\Normalizer;
use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
+use Symfony\Component\Serializer\Serializer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
{
@@ -265,12 +268,55 @@ public function testUnableToNormalizeObjectAttribute()
$serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
$this->normalizer->setSerializer($serializer);
- $obj = new GetSetDummy();
+ $obj = new GetSetDummy();
$object = new \stdClass();
$obj->setObject($object);
$this->normalizer->normalize($obj, 'any');
}
+
+ /**
+ * @expectedException \Symfony\Component\Serializer\Exception\CircularReferenceException
+ */
+ public function testUnableToNormalizeCircularReference()
+ {
+ $serializer = new Serializer(array($this->normalizer));
+ $this->normalizer->setSerializer($serializer);
+ $this->normalizer->setCircularReferenceLimit(2);
+
+ $obj = new CircularReferenceDummy();
+
+ $this->normalizer->normalize($obj);
+ }
+
+ public function testSiblingReference()
+ {
+ $serializer = new Serializer(array($this->normalizer));
+ $this->normalizer->setSerializer($serializer);
+
+ $siblingHolder = new SiblingHolder();
+
+ $expected = array(
+ 'sibling0' => array('coopTilleuls' => 'Les-Tilleuls.coop'),
+ 'sibling1' => array('coopTilleuls' => 'Les-Tilleuls.coop'),
+ 'sibling2' => array('coopTilleuls' => 'Les-Tilleuls.coop'),
+ );
+ $this->assertEquals($expected, $this->normalizer->normalize($siblingHolder));
+ }
+
+ public function testCircularReferenceHandler()
+ {
+ $serializer = new Serializer(array($this->normalizer));
+ $this->normalizer->setSerializer($serializer);
+ $this->normalizer->setCircularReferenceHandler(function ($obj) {
+ return get_class($obj);
+ });
+
+ $obj = new CircularReferenceDummy();
+
+ $expected = array('me' => 'Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy');
+ $this->assertEquals($expected, $this->normalizer->normalize($obj));
+ }
}
class GetSetDummy
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b398b75efb0a4bb6c5b00b1e2b54491def0f8265
--- /dev/null
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -0,0 +1,247 @@
+<?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\Serializer\Tests\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;
+
+class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var PropertyNormalizer
+ */
+ private $normalizer;
+
+ protected function setUp()
+ {
+ $this->normalizer = new PropertyNormalizer();
+ $this->normalizer->setSerializer($this->getMock('Symfony\Component\Serializer\Serializer'));
+ }
+
+ public function testNormalize()
+ {
+ $obj = new PropertyDummy();
+ $obj->foo = 'foo';
+ $obj->setBar('bar');
+ $obj->setCamelCase('camelcase');
+ $this->assertEquals(
+ array('foo' => 'foo', 'bar' => 'bar', 'camelCase' => 'camelcase'),
+ $this->normalizer->normalize($obj, 'any')
+ );
+ }
+
+ public function testDenormalize()
+ {
+ $obj = $this->normalizer->denormalize(
+ array('foo' => 'foo', 'bar' => 'bar'),
+ __NAMESPACE__.'\PropertyDummy',
+ 'any'
+ );
+ $this->assertEquals('foo', $obj->foo);
+ $this->assertEquals('bar', $obj->getBar());
+ }
+
+ public function testDenormalizeOnCamelCaseFormat()
+ {
+ $this->normalizer->setCamelizedAttributes(array('camel_case'));
+ $obj = $this->normalizer->denormalize(
+ array('camel_case' => 'value'),
+ __NAMESPACE__.'\PropertyDummy'
+ );
+ $this->assertEquals('value', $obj->getCamelCase());
+ }
+
+ /**
+ * @dataProvider attributeProvider
+ */
+ public function testFormatAttribute($attribute, $camelizedAttributes, $result)
+ {
+ $r = new \ReflectionObject($this->normalizer);
+ $m = $r->getMethod('formatAttribute');
+ $m->setAccessible(true);
+
+ $this->normalizer->setCamelizedAttributes($camelizedAttributes);
+ $this->assertEquals($m->invoke($this->normalizer, $attribute, $camelizedAttributes), $result);
+ }
+
+ public function attributeProvider()
+ {
+ return array(
+ array('attribute_test', array('attribute_test'),'AttributeTest'),
+ array('attribute_test', array('any'),'attribute_test'),
+ array('attribute', array('attribute'),'Attribute'),
+ array('attribute', array(), 'attribute'),
+ );
+ }
+
+ public function testConstructorDenormalize()
+ {
+ $obj = $this->normalizer->denormalize(
+ array('foo' => 'foo', 'bar' => 'bar'),
+ __NAMESPACE__.'\PropertyConstructorDummy',
+ 'any'
+ );
+ $this->assertEquals('foo', $obj->getFoo());
+ $this->assertEquals('bar', $obj->getBar());
+ }
+
+ /**
+ * @dataProvider provideCallbacks
+ */
+ public function testCallbacks($callbacks, $value, $result, $message)
+ {
+ $this->normalizer->setCallbacks($callbacks);
+
+ $obj = new PropertyConstructorDummy('', $value);
+
+ $this->assertEquals(
+ $result,
+ $this->normalizer->normalize($obj, 'any'),
+ $message
+ );
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ */
+ public function testUncallableCallbacks()
+ {
+ $this->normalizer->setCallbacks(array('bar' => null));
+
+ $obj = new PropertyConstructorDummy('baz', 'quux');
+
+ $this->normalizer->normalize($obj, 'any');
+ }
+
+ public function testIgnoredAttributes()
+ {
+ $this->normalizer->setIgnoredAttributes(array('foo', 'bar', 'camelCase'));
+
+ $obj = new PropertyDummy();
+ $obj->foo = 'foo';
+ $obj->setBar('bar');
+
+ $this->assertEquals(
+ array(),
+ $this->normalizer->normalize($obj, 'any')
+ );
+ }
+
+ public function provideCallbacks()
+ {
+ return array(
+ array(
+ array(
+ 'bar' => function ($bar) {
+ return 'baz';
+ },
+ ),
+ 'baz',
+ array('foo' => '', 'bar' => 'baz'),
+ 'Change a string',
+ ),
+ array(
+ array(
+ 'bar' => function ($bar) {
+ return null;
+ },
+ ),
+ 'baz',
+ array('foo' => '', 'bar' => null),
+ 'Null an item'
+ ),
+ array(
+ array(
+ 'bar' => function ($bar) {
+ return $bar->format('d-m-Y H:i:s');
+ },
+ ),
+ new \DateTime('2011-09-10 06:30:00'),
+ array('foo' => '', 'bar' => '10-09-2011 06:30:00'),
+ 'Format a date',
+ ),
+ array(
+ array(
+ 'bar' => function ($bars) {
+ $foos = '';
+ foreach ($bars as $bar) {
+ $foos .= $bar->getFoo();
+ }
+
+ return $foos;
+ },
+ ),
+ array(new PropertyConstructorDummy('baz', ''), new PropertyConstructorDummy('quux', '')),
+ array('foo' => '', 'bar' => 'bazquux'),
+ 'Collect a property',
+ ),
+ array(
+ array(
+ 'bar' => function ($bars) {
+ return count($bars);
+ },
+ ),
+ array(new PropertyConstructorDummy('baz', ''), new PropertyConstructorDummy('quux', '')),
+ array('foo' => '', 'bar' => 2),
+ 'Count a property',
+ ),
+ );
+ }
+}
+
+class PropertyDummy
+{
+ public $foo;
+ private $bar;
+ protected $camelCase;
+
+ public function getBar()
+ {
+ return $this->bar;
+ }
+
+ public function setBar($bar)
+ {
+ $this->bar = $bar;
+ }
+
+ public function getCamelCase()
+ {
+ return $this->camelCase;
+ }
+
+ public function setCamelCase($camelCase)
+ {
+ $this->camelCase = $camelCase;
+ }
+}
+
+class PropertyConstructorDummy
+{
+ protected $foo;
+ private $bar;
+
+ public function __construct($foo, $bar)
+ {
+ $this->foo = $foo;
+ $this->bar = $bar;
+ }
+
+ public function getFoo()
+ {
+ return $this->foo;
+ }
+
+ public function getBar()
+ {
+ return $this->bar;
+ }
+}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json b/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json
index 9e0fe096b07e7174b748bd60e4f6182b11cb2bf7..eab354fa9172824af07b2244d6add4225630cf69 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/CHANGELOG.md b/core/vendor/symfony/validator/Symfony/Component/Validator/CHANGELOG.md
index 34fe232dcfe78f625ebc65c958af231f4d2261c8..329eaf3eb0aed69f7c2b1103ad900671c9ffb6de 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/CHANGELOG.md
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,21 @@
CHANGELOG
=========
+2.6.0
+-----
+
+ * [BC BREAK] `FileValidator` disallow empty files
+ * [BC BREAK] `UserPasswordValidator` source message change
+ * [BC BREAK] added internal `ExecutionContextInterface::setConstraint()`
+ * added `ConstraintViolation::getConstraint()`
+ * [BC BREAK] The `ExpressionValidator` will now evaluate the Expression even when the property value is null or an empty string
+ * deprecated `ClassMetadata::hasMemberMetadatas()`
+ * deprecated `ClassMetadata::getMemberMetadatas()`
+ * deprecated `ClassMetadata::addMemberMetadata()`
+ * [BC BREAK] added `Mapping\MetadataInterface::getConstraints()`
+ * added generic "payload" option to all constraints for attaching domain-specific data
+ * [BC BREAK] added `ConstraintViolationBuilderInterface::setCause()`
+
2.5.0
-----
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php
index 3608e48f07b11c51249c4149370466298f92c439..b08ddfba4180e49b30dd136caf76e18da8fdbe9b 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Exception\InvalidArgumentException;
use Symfony\Component\Validator\Exception\InvalidOptionsException;
use Symfony\Component\Validator\Exception\MissingOptionsException;
@@ -24,6 +25,8 @@
*
* Constraint instances are immutable and serializable.
*
+ * @property array $groups The groups that the constraint belongs to
+ *
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
@@ -49,9 +52,38 @@ abstract class Constraint
const PROPERTY_CONSTRAINT = 'property';
/**
+ * Maps error codes to the names of their constants
* @var array
*/
- public $groups = array(self::DEFAULT_GROUP);
+ protected static $errorNames = array();
+
+ /**
+ * Domain-specific data attached to a constraint
+ * @var mixed
+ */
+ public $payload;
+
+ /**
+ * Returns the name of the given error code.
+ *
+ * @param int $errorCode The error code
+ *
+ * @return string The name of the error code
+ *
+ * @throws InvalidArgumentException If the error code does not exist
+ */
+ public static function getErrorName($errorCode)
+ {
+ if (!isset(static::$errorNames[$errorCode])) {
+ throw new InvalidArgumentException(sprintf(
+ 'The error code "%s" does not exist for constraint of type "%s".',
+ $errorCode,
+ get_called_class()
+ ));
+ }
+
+ return static::$errorNames[$errorCode];
+ }
/**
* Initializes the constraint with options.
@@ -86,6 +118,10 @@ public function __construct($options = null)
{
$invalidOptions = array();
$missingOptions = array_flip((array) $this->getRequiredOptions());
+ $knownOptions = get_object_vars($this);
+
+ // The "groups" option is added to the object lazily
+ $knownOptions['groups'] = true;
if (is_array($options) && count($options) >= 1 && isset($options['value']) && !property_exists($this, 'value')) {
$options[$this->getDefaultOption()] = $options['value'];
@@ -94,14 +130,14 @@ public function __construct($options = null)
if (is_array($options) && count($options) > 0 && is_string(key($options))) {
foreach ($options as $option => $value) {
- if (property_exists($this, $option)) {
+ if (array_key_exists($option, $knownOptions)) {
$this->$option = $value;
unset($missingOptions[$option]);
} else {
$invalidOptions[] = $option;
}
}
- } elseif (null !== $options && ! (is_array($options) && count($options) === 0)) {
+ } elseif (null !== $options && !(is_array($options) && count($options) === 0)) {
$option = $this->getDefaultOption();
if (null === $option) {
@@ -110,7 +146,7 @@ public function __construct($options = null)
);
}
- if (property_exists($this, $option)) {
+ if (array_key_exists($option, $knownOptions)) {
$this->$option = $options;
unset($missingOptions[$option]);
} else {
@@ -131,15 +167,56 @@ public function __construct($options = null)
array_keys($missingOptions)
);
}
-
- $this->groups = (array) $this->groups;
}
/**
- * Unsupported operation.
+ * Sets the value of a lazily initialized option.
+ *
+ * Corresponding properties are added to the object on first access. Hence
+ * this method will be called at most once per constraint instance and
+ * option name.
+ *
+ * @param string $option The option name
+ * @param mixed $value The value to set
+ *
+ * @throws InvalidOptionsException If an invalid option name is given
*/
public function __set($option, $value)
{
+ if ('groups' === $option) {
+ $this->groups = (array) $value;
+
+ return;
+ }
+
+ throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, get_class($this)), array($option));
+ }
+
+ /**
+ * Returns the value of a lazily initialized option.
+ *
+ * Corresponding properties are added to the object on first access. Hence
+ * this method will be called at most once per constraint instance and
+ * option name.
+ *
+ * @param string $option The option name
+ *
+ * @return mixed The value of the option
+ *
+ * @throws InvalidOptionsException If an invalid option name is given
+ *
+ * @internal This method should not be used or overwritten in userland code.
+ *
+ * @since 2.6
+ */
+ public function __get($option)
+ {
+ if ('groups' === $option) {
+ $this->groups = array(self::DEFAULT_GROUP);
+
+ return $this->groups;
+ }
+
throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, get_class($this)), array($option));
}
@@ -217,4 +294,23 @@ public function getTargets()
{
return self::PROPERTY_CONSTRAINT;
}
+
+ /**
+ * Optimizes the serialized value to minimize storage space.
+ *
+ * @return array The properties to serialize
+ *
+ * @internal This method may be replaced by an implementation of
+ * {@link \Serializable} in the future. Please don't use or
+ * overwrite it.
+ *
+ * @since 2.6
+ */
+ public function __sleep()
+ {
+ // Initialize "groups" option if it is not set
+ $this->groups;
+
+ return array_keys(get_object_vars($this));
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintValidator.php
index 111c2b4bacec46134ab86714c7a6010ca7673384..d014bddde68072b493b81507b0e278a8d0381f34 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintValidator.php
@@ -134,11 +134,22 @@ protected function formatTypeOf($value)
*/
protected function formatValue($value, $format = 0)
{
- if (($format & self::PRETTY_DATE) && $value instanceof \DateTime) {
+ $isDateTime = $value instanceof \DateTime || $value instanceof \DateTimeInterface;
+
+ if (($format & self::PRETTY_DATE) && $isDateTime) {
if (class_exists('IntlDateFormatter')) {
$locale = \Locale::getDefault();
$formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT);
+ // neither the native nor the stub IntlDateFormatter support
+ // DateTimeImmutable as of yet
+ if (!$value instanceof \DateTime) {
+ $value = new \DateTime(
+ $value->format('Y-m-d H:i:s.u e'),
+ $value->getTimezone()
+ );
+ }
+
return $formatter->format($value);
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolation.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolation.php
index d6a4e3095f424f9e387687f78b6cab4b5826510a..8f4744f576fe64b341cecaabd9c7b30ef442644d 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolation.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolation.php
@@ -53,29 +53,42 @@ class ConstraintViolation implements ConstraintViolationInterface
*/
private $invalidValue;
+ /**
+ * @var Constraint|null
+ */
+ private $constraint;
+
/**
* @var mixed
*/
private $code;
+ /**
+ * @var mixed
+ */
+ private $cause;
+
/**
* Creates a new constraint violation.
*
- * @param string $message The violation message
- * @param string $messageTemplate The raw violation message
- * @param array $parameters The parameters to substitute in the
- * raw violation message
- * @param mixed $root The value originally passed to the
- * validator
- * @param string $propertyPath The property path from the root
- * value to the invalid value
- * @param mixed $invalidValue The invalid value that caused this
- * violation
- * @param int|null $plural The number for determining the plural
- * form when translating the message
- * @param mixed $code The error code of the violation
- */
- public function __construct($message, $messageTemplate, array $parameters, $root, $propertyPath, $invalidValue, $plural = null, $code = null)
+ * @param string $message The violation message
+ * @param string $messageTemplate The raw violation message
+ * @param array $parameters The parameters to substitute in the
+ * raw violation message
+ * @param mixed $root The value originally passed to the
+ * validator
+ * @param string $propertyPath The property path from the root
+ * value to the invalid value
+ * @param mixed $invalidValue The invalid value that caused this
+ * violation
+ * @param int|null $plural The number for determining the plural
+ * form when translating the message
+ * @param mixed $code The error code of the violation
+ * @param Constraint|null $constraint The constraint whose validation
+ * caused the violation
+ * @param mixed $cause The cause of the violation
+ */
+ public function __construct($message, $messageTemplate, array $parameters, $root, $propertyPath, $invalidValue, $plural = null, $code = null, Constraint $constraint = null, $cause = null)
{
$this->message = $message;
$this->messageTemplate = $messageTemplate;
@@ -84,7 +97,9 @@ public function __construct($message, $messageTemplate, array $parameters, $root
$this->root = $root;
$this->propertyPath = $propertyPath;
$this->invalidValue = $invalidValue;
+ $this->constraint = $constraint;
$this->code = $code;
+ $this->cause = $cause;
}
/**
@@ -188,6 +203,26 @@ public function getInvalidValue()
return $this->invalidValue;
}
+ /**
+ * Returns the constraint whose validation caused the violation.
+ *
+ * @return Constraint|null The constraint or null if it is not known
+ */
+ public function getConstraint()
+ {
+ return $this->constraint;
+ }
+
+ /**
+ * Returns the cause of the violation.
+ *
+ * @return mixed
+ */
+ public function getCause()
+ {
+ return $this->cause;
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
index ce7239d98ddf6137c9e401786bbe3504138dbf3d..1aa13c89784441eabd979f0399fff7ea3e65b480 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
@@ -38,6 +38,21 @@ public function validate($value, Constraint $constraint)
$comparedValue = $constraint->value;
+ // Convert strings to DateTimes if comparing another DateTime
+ // This allows to compare with any date/time value supported by
+ // the DateTime constructor:
+ // http://php.net/manual/en/datetime.formats.php
+ if (is_string($comparedValue)) {
+ if ($value instanceof \DatetimeImmutable) {
+ // If $value is immutable, convert the compared value to a
+ // DateTimeImmutable too
+ $comparedValue = new \DatetimeImmutable($comparedValue);
+ } elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
+ // Otherwise use DateTime
+ $comparedValue = new \DateTime($comparedValue);
+ }
+ }
+
if (!$this->compareValues($value, $comparedValue)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE))
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/All.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/All.php
index 95132971328fff8ce3d9b6559e10448b06e4f9a5..3250fcfdf2177e565df566feca3d4526a9fc80f7 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/All.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/All.php
@@ -11,9 +11,6 @@
namespace Symfony\Component\Validator\Constraints;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
/**
* @Annotation
* @Target({"PROPERTY", "METHOD", "ANNOTATION"})
@@ -22,32 +19,10 @@
*
* @api
*/
-class All extends Constraint
+class All extends Composite
{
public $constraints = array();
- /**
- * {@inheritdoc}
- */
- public function __construct($options = null)
- {
- parent::__construct($options);
-
- if (!is_array($this->constraints)) {
- $this->constraints = array($this->constraints);
- }
-
- foreach ($this->constraints as $constraint) {
- if (!$constraint instanceof Constraint) {
- throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, __CLASS__));
- }
-
- if ($constraint instanceof Valid) {
- throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', __CLASS__));
- }
- }
- }
-
public function getDefaultOption()
{
return 'constraints';
@@ -57,4 +32,9 @@ public function getRequiredOptions()
{
return array('constraints');
}
+
+ protected function getCompositeOption()
+ {
+ return 'constraints';
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AllValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AllValidator.php
index 29cf9859022cf783ba70891068d505a5f2b068c9..a655afc1d25438e2ae3089884b2d6eba1a427ffd 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AllValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AllValidator.php
@@ -41,18 +41,17 @@ public function validate($value, Constraint $constraint)
}
$context = $this->context;
- $group = $context->getGroup();
if ($context instanceof ExecutionContextInterface) {
$validator = $context->getValidator()->inContext($context);
foreach ($value as $key => $element) {
- $validator->atPath('['.$key.']')->validate($element, $constraint->constraints, $group);
+ $validator->atPath('['.$key.']')->validate($element, $constraint->constraints);
}
} else {
// 2.4 API
foreach ($value as $key => $element) {
- $context->validateValue($element, $constraint->constraints, '['.$key.']', $group);
+ $context->validateValue($element, $constraint->constraints, '['.$key.']');
}
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardScheme.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardScheme.php
index 26a0e1c2fd466b4f0a4b75294dad3cea6f0d65df..14f3b5d8cf0c1e6ed5d7e0cdc7d5a517b6c8a51c 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardScheme.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardScheme.php
@@ -20,9 +20,18 @@
* @Target({"PROPERTY", "METHOD", "ANNOTATION"})
*
* @author Tim Nagel <t.nagel@infinite.net.au>
+ * @author Bernhard Schussek <bschussek@gmail.com>
*/
class CardScheme extends Constraint
{
+ const NOT_NUMERIC_ERROR = 1;
+ const INVALID_FORMAT_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::NOT_NUMERIC_ERROR => 'NOT_NUMERIC_ERROR',
+ self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
+ );
+
public $message = 'Unsupported card type or invalid card number.';
public $schemes;
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
index 7cf7fa4bfe04cc1e2b2de1915b5be97c1118a4cc..62492e61eaae58d2b91f45ada1c2cd744e72bac6 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
@@ -117,6 +117,7 @@ public function validate($value, Constraint $constraint)
if (!is_numeric($value)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(CardScheme::NOT_NUMERIC_ERROR)
->addViolation();
return;
@@ -135,6 +136,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(CardScheme::INVALID_FORMAT_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Choice.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Choice.php
index c2b3436206f6fea1da8ba0822b1b146f56d34d0f..39a64574d0d29f7a696e2bc4cfaae48dd178af91 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Choice.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Choice.php
@@ -23,12 +23,22 @@
*/
class Choice extends Constraint
{
+ const NO_SUCH_CHOICE_ERROR = 1;
+ const TOO_FEW_ERROR = 2;
+ const TOO_MANY_ERROR = 3;
+
+ protected static $errorNames = array(
+ self::NO_SUCH_CHOICE_ERROR => 'NO_SUCH_CHOICE_ERROR',
+ self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',
+ self::TOO_MANY_ERROR => 'TOO_MANY_ERROR',
+ );
+
public $choices;
public $callback;
public $multiple = false;
public $strict = false;
- public $min = null;
- public $max = null;
+ public $min;
+ public $max;
public $message = 'The value you selected is not a valid choice.';
public $multipleMessage = 'One or more of the given values is invalid.';
public $minMessage = 'You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.';
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ChoiceValidator.php
index 5640c733173a5d5c93f5c871560e73f4c6ebad48..1566c318c3defeebeaafdb43514ca0372487ecc2 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -65,6 +65,7 @@ public function validate($value, Constraint $constraint)
if (!in_array($_value, $choices, $constraint->strict)) {
$this->buildViolation($constraint->multipleMessage)
->setParameter('{{ value }}', $this->formatValue($_value))
+ ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
->setInvalidValue($_value)
->addViolation();
@@ -78,6 +79,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->minMessage)
->setParameter('{{ limit }}', $constraint->min)
->setPlural((int) $constraint->min)
+ ->setCode(Choice::TOO_FEW_ERROR)
->addViolation();
return;
@@ -87,6 +89,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->maxMessage)
->setParameter('{{ limit }}', $constraint->max)
->setPlural((int) $constraint->max)
+ ->setCode(Choice::TOO_MANY_ERROR)
->addViolation();
return;
@@ -94,6 +97,7 @@ public function validate($value, Constraint $constraint)
} elseif (!in_array($value, $choices, $constraint->strict)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Collection.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Collection.php
index 1e9cb549de14fae57cdada101d42a903f1e8b180..708c8ed47730eeb641e76ce1df4d6e89706f2e55 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Collection.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Collection.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\Validator\Constraints;
-use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
/**
@@ -22,8 +21,16 @@
*
* @api
*/
-class Collection extends Constraint
+class Collection extends Composite
{
+ const MISSING_FIELD_ERROR = 1;
+ const NO_SUCH_FIELD_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::MISSING_FIELD_ERROR => 'MISSING_FIELD_ERROR',
+ self::NO_SUCH_FIELD_ERROR => 'NO_SUCH_FIELD_ERROR',
+ );
+
public $fields = array();
public $allowExtraFields = false;
public $allowMissingFields = false;
@@ -42,6 +49,14 @@ public function __construct($options = null)
}
parent::__construct($options);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function initializeNestedConstraints()
+ {
+ parent::initializeNestedConstraints();
if (!is_array($this->fields)) {
throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s', __CLASS__));
@@ -57,20 +72,6 @@ public function __construct($options = null)
if (!$field instanceof Optional && !$field instanceof Required) {
$this->fields[$fieldName] = $field = new Required($field);
}
-
- if (!is_array($field->constraints)) {
- $field->constraints = array($field->constraints);
- }
-
- foreach ($field->constraints as $constraint) {
- if (!$constraint instanceof Constraint) {
- throw new ConstraintDefinitionException(sprintf('The value %s of the field %s is not an instance of Constraint in constraint %s', $constraint, $fieldName, __CLASS__));
- }
-
- if ($constraint instanceof Valid) {
- throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', __CLASS__));
- }
- }
}
}
@@ -78,4 +79,9 @@ public function getRequiredOptions()
{
return array('fields');
}
+
+ protected function getCompositeOption()
+ {
+ return 'fields';
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CollectionValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CollectionValidator.php
index 4289169b1606c30c2dde5ed7d4d5289d4245c80a..c3180d21622b92051a01ddcc1e87ff40117d6309 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CollectionValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CollectionValidator.php
@@ -50,7 +50,6 @@ public function validate($value, Constraint $constraint)
// remove the initialize() method and pass the context as last argument
// to validate() instead.
$context = $this->context;
- $group = $context->getGroup();
foreach ($constraint->fields as $field => $fieldConstraint) {
// bug fix issue #2779
@@ -63,10 +62,10 @@ public function validate($value, Constraint $constraint)
$context->getValidator()
->inContext($context)
->atPath('['.$field.']')
- ->validate($value[$field], $fieldConstraint->constraints, $group);
+ ->validate($value[$field], $fieldConstraint->constraints);
} else {
// 2.4 API
- $context->validateValue($value[$field], $fieldConstraint->constraints, '['.$field.']', $group);
+ $context->validateValue($value[$field], $fieldConstraint->constraints, '['.$field.']');
}
}
} elseif (!$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
@@ -74,6 +73,7 @@ public function validate($value, Constraint $constraint)
->atPath('['.$field.']')
->setParameter('{{ field }}', $this->formatValue($field))
->setInvalidValue(null)
+ ->setCode(Collection::MISSING_FIELD_ERROR)
->addViolation();
}
}
@@ -85,6 +85,7 @@ public function validate($value, Constraint $constraint)
->atPath('['.$field.']')
->setParameter('{{ field }}', $this->formatValue($field))
->setInvalidValue($fieldValue)
+ ->setCode(Collection::NO_SUCH_FIELD_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Composite.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Composite.php
new file mode 100644
index 0000000000000000000000000000000000000000..22a748cbf42d1d544bb3390a127c5c8318221be1
--- /dev/null
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Composite.php
@@ -0,0 +1,152 @@
+<?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\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+
+/**
+ * A constraint that is composed of other constraints.
+ *
+ * You should never use the nested constraint instances anywhere else, because
+ * their groups are adapted when passed to the constructor of this class.
+ *
+ * If you want to create your own composite constraint, extend this class and
+ * let {@link getCompositeOption()} return the name of the property which
+ * contains the nested constraints.
+ *
+ * @since 2.6
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+abstract class Composite extends Constraint
+{
+ /**
+ * {@inheritdoc}
+ *
+ * The groups of the composite and its nested constraints are made
+ * consistent using the following strategy:
+ *
+ * - If groups are passed explicitly to the composite constraint, but
+ * not to the nested constraints, the options of the composite
+ * constraint are copied to the nested constraints;
+ *
+ * - If groups are passed explicitly to the nested constraints, but not
+ * to the composite constraint, the groups of all nested constraints
+ * are merged and used as groups for the composite constraint;
+ *
+ * - If groups are passed explicitly to both the composite and its nested
+ * constraints, the groups of the nested constraints must be a subset
+ * of the groups of the composite constraint. If not, a
+ * {@link ConstraintDefinitionException} is thrown.
+ *
+ * All this is done in the constructor, because constraints can then be
+ * cached. When constraints are loaded from the cache, no more group
+ * checks need to be done.
+ */
+ public function __construct($options = null)
+ {
+ parent::__construct($options);
+
+ $this->initializeNestedConstraints();
+
+ /** @var Constraint[] $nestedConstraints */
+ $compositeOption = $this->getCompositeOption();
+ $nestedConstraints = $this->$compositeOption;
+
+ if (!is_array($nestedConstraints)) {
+ $nestedConstraints = array($nestedConstraints);
+ }
+
+ foreach ($nestedConstraints as $constraint) {
+ if (!$constraint instanceof Constraint) {
+ throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, get_class($this)));
+ }
+
+ if ($constraint instanceof Valid) {
+ throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', get_class($this)));
+ }
+ }
+
+ if (!property_exists($this, 'groups')) {
+ $mergedGroups = array();
+
+ foreach ($nestedConstraints as $constraint) {
+ foreach ($constraint->groups as $group) {
+ $mergedGroups[$group] = true;
+ }
+ }
+
+ $this->groups = array_keys($mergedGroups);
+ $this->$compositeOption = $nestedConstraints;
+
+ return;
+ }
+
+ foreach ($nestedConstraints as $constraint) {
+ if (property_exists($constraint, 'groups')) {
+ $excessGroups = array_diff($constraint->groups, $this->groups);
+
+ if (count($excessGroups) > 0) {
+ throw new ConstraintDefinitionException(sprintf(
+ 'The group(s) "%s" passed to the constraint %s '.
+ 'should also be passed to its containing constraint %s',
+ implode('", "', $excessGroups),
+ get_class($constraint),
+ get_class($this)
+ ));
+ }
+ } else {
+ $constraint->groups = $this->groups;
+ }
+ }
+
+ $this->$compositeOption = $nestedConstraints;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * Implicit group names are forwarded to nested constraints.
+ *
+ * @param string $group
+ */
+ public function addImplicitGroupName($group)
+ {
+ parent::addImplicitGroupName($group);
+
+ /** @var Constraint[] $nestedConstraints */
+ $nestedConstraints = $this->{$this->getCompositeOption()};
+
+ foreach ($nestedConstraints as $constraint) {
+ $constraint->addImplicitGroupName($group);
+ }
+ }
+
+ /**
+ * Returns the name of the property that contains the nested constraints.
+ *
+ * @return string The property name
+ */
+ abstract protected function getCompositeOption();
+
+ /**
+ * Initializes the nested constraints.
+ *
+ * This method can be overwritten in subclasses to clean up the nested
+ * constraints passed to the constructor.
+ *
+ * @see Collection::initializeNestedConstraints()
+ */
+ protected function initializeNestedConstraints()
+ {
+ }
+}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Count.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Count.php
index 1d64344b4ab6aa565d79d639928b33a71c1c6c14..a3e12fe1342d8529623bb876b048a39d57c2b8b9 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Count.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Count.php
@@ -24,6 +24,14 @@
*/
class Count extends Constraint
{
+ const TOO_FEW_ERROR = 1;
+ const TOO_MANY_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',
+ self::TOO_MANY_ERROR => 'TOO_MANY_ERROR',
+ );
+
public $minMessage = 'This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.';
public $maxMessage = 'This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.';
public $exactMessage = 'This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.';
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CountValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CountValidator.php
index 0f40a3f1e0deb60be44e86e420fc2ac6c6f1cf71..d44f537071a3b77824c83059e29083ee0b1a1e3f 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CountValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CountValidator.php
@@ -41,6 +41,7 @@ public function validate($value, Constraint $constraint)
->setParameter('{{ limit }}', $constraint->max)
->setInvalidValue($value)
->setPlural((int) $constraint->max)
+ ->setCode(Count::TOO_MANY_ERROR)
->addViolation();
return;
@@ -52,6 +53,7 @@ public function validate($value, Constraint $constraint)
->setParameter('{{ limit }}', $constraint->min)
->setInvalidValue($value)
->setPlural((int) $constraint->min)
+ ->setCode(Count::TOO_FEW_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Date.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Date.php
index 9e29168965153deacc8ffbdcd3e8556371e71d46..2bc444f71af68e1b2ca70845c382b82ba92612bd 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Date.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Date.php
@@ -23,5 +23,13 @@
*/
class Date extends Constraint
{
+ const INVALID_FORMAT_ERROR = 1;
+ const INVALID_DATE_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
+ self::INVALID_DATE_ERROR => 'INVALID_DATE_ERROR',
+ );
+
public $message = 'This value is not a valid date.';
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTime.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTime.php
index 1657f43afcd15a38b391543d5c63e0a7761f13c7..ae67ff30efb4b33b329cb29b70829c685a809a93 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTime.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTime.php
@@ -23,5 +23,15 @@
*/
class DateTime extends Constraint
{
+ const INVALID_FORMAT_ERROR = 1;
+ const INVALID_DATE_ERROR = 2;
+ const INVALID_TIME_ERROR = 3;
+
+ protected static $errorNames = array(
+ self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
+ self::INVALID_DATE_ERROR => 'INVALID_DATE_ERROR',
+ self::INVALID_TIME_ERROR => 'INVALID_TIME_ERROR',
+ );
+
public $message = 'This value is not a valid datetime.';
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTimeValidator.php
index 88c8e2586229428fd099d332638d9069089e5439..b459c7873f7cbf6f5a575383add8abd9ddf5b917 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTimeValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -45,6 +45,7 @@ public function validate($value, Constraint $constraint)
if (!preg_match(static::PATTERN, $value, $matches)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(DateTime::INVALID_FORMAT_ERROR)
->addViolation();
return;
@@ -53,12 +54,14 @@ public function validate($value, Constraint $constraint)
if (!DateValidator::checkDate($matches[1], $matches[2], $matches[3])) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(DateTime::INVALID_DATE_ERROR)
->addViolation();
}
if (!TimeValidator::checkTime($matches[4], $matches[5], $matches[6])) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(DateTime::INVALID_TIME_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateValidator.php
index e1640b13b3858c2624ab09b3fd16507fb2bfc992..77f01116666161266724b0587a373466f43b54dc 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/DateValidator.php
@@ -62,6 +62,7 @@ public function validate($value, Constraint $constraint)
if (!preg_match(static::PATTERN, $value, $matches)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Date::INVALID_FORMAT_ERROR)
->addViolation();
return;
@@ -70,6 +71,7 @@ public function validate($value, Constraint $constraint)
if (!self::checkDate($matches[1], $matches[2], $matches[3])) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Date::INVALID_DATE_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Email.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Email.php
index 8d239a4a81e031207495ed78c4172180445bb870..36977177bdfd1ea996a26096c35a1bc7ec792df3 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Email.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Email.php
@@ -23,8 +23,18 @@
*/
class Email extends Constraint
{
+ const INVALID_FORMAT_ERROR = 1;
+ const MX_CHECK_FAILED_ERROR = 2;
+ const HOST_CHECK_FAILED_ERROR = 3;
+
+ protected static $errorNames = array(
+ self::INVALID_FORMAT_ERROR => 'STRICT_CHECK_FAILED_ERROR',
+ self::MX_CHECK_FAILED_ERROR => 'MX_CHECK_FAILED_ERROR',
+ self::HOST_CHECK_FAILED_ERROR => 'HOST_CHECK_FAILED_ERROR',
+ );
+
public $message = 'This value is not a valid email address.';
public $checkMX = false;
public $checkHost = false;
- public $strict = null;
+ public $strict;
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/EmailValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/EmailValidator.php
index 1f487ca1c4a46d61d01b40ccf7e34d7e9f755ccc..ee588dca9f8cfe0b1620da3725cf4c326433d486 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/EmailValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -68,6 +68,7 @@ public function validate($value, Constraint $constraint)
if (!$strictValidator->isValid($value, false, true)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Email::INVALID_FORMAT_ERROR)
->addViolation();
return;
@@ -75,6 +76,7 @@ public function validate($value, Constraint $constraint)
} elseif (!preg_match('/.+\@.+\..+/', $value)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Email::INVALID_FORMAT_ERROR)
->addViolation();
return;
@@ -87,6 +89,7 @@ public function validate($value, Constraint $constraint)
if (!$this->checkMX($host)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Email::MX_CHECK_FAILED_ERROR)
->addViolation();
}
@@ -96,6 +99,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->checkHost && !$this->checkHost($host)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Email::HOST_CHECK_FAILED_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Existence.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Existence.php
index dbe122b77adcecd6ada749e68f385e8ace8be3f3..5ea6ffe643eecf97450bb2da2005a58f19248b42 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Existence.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Existence.php
@@ -11,12 +11,10 @@
namespace Symfony\Component\Validator\Constraints;
-use Symfony\Component\Validator\Constraint;
-
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
-abstract class Existence extends Constraint
+abstract class Existence extends Composite
{
public $constraints = array();
@@ -24,4 +22,9 @@ public function getDefaultOption()
{
return 'constraints';
}
+
+ protected function getCompositeOption()
+ {
+ return 'constraints';
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ExpressionValidator.php
index a20d1ac2518f431fbdf49b6bcb97fa3c39558481..fd3e903f2220f90ab4bc454d72732c2e3a00b0c9 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ExpressionValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -60,10 +60,6 @@ public function validate($value, Constraint $constraint)
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Expression');
}
- if (null === $value || '' === $value) {
- return;
- }
-
$variables = array();
// Symfony 2.5+
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/File.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/File.php
index 80527171ecbef8cfbf63cae7afd656d6aa615033..ae0ad673955948f24d0865eca059b34cd8246553 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/File.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/File.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Constraints;
use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
/**
* @Annotation
@@ -23,19 +24,63 @@
*/
class File extends Constraint
{
- public $maxSize = null;
+ // Check the Image constraint for clashes if adding new constants here
+
+ const NOT_FOUND_ERROR = 1;
+ const NOT_READABLE_ERROR = 2;
+ const EMPTY_ERROR = 3;
+ const TOO_LARGE_ERROR = 4;
+ const INVALID_MIME_TYPE_ERROR = 5;
+
+ protected static $errorNames = array(
+ self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
+ self::NOT_READABLE_ERROR => 'NOT_READABLE_ERROR',
+ self::EMPTY_ERROR => 'EMPTY_ERROR',
+ self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
+ self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
+ );
+
+ public $maxSize;
+ public $binaryFormat;
public $mimeTypes = array();
public $notFoundMessage = 'The file could not be found.';
public $notReadableMessage = 'The file is not readable.';
public $maxSizeMessage = 'The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.';
public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
+ public $disallowEmptyMessage = 'An empty file is not allowed.';
- public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.';
- public $uploadFormSizeErrorMessage = 'The file is too large.';
- public $uploadPartialErrorMessage = 'The file was only partially uploaded.';
- public $uploadNoFileErrorMessage = 'No file was uploaded.';
- public $uploadNoTmpDirErrorMessage = 'No temporary folder was configured in php.ini.';
+ public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.';
+ public $uploadFormSizeErrorMessage = 'The file is too large.';
+ public $uploadPartialErrorMessage = 'The file was only partially uploaded.';
+ public $uploadNoFileErrorMessage = 'No file was uploaded.';
+ public $uploadNoTmpDirErrorMessage = 'No temporary folder was configured in php.ini.';
public $uploadCantWriteErrorMessage = 'Cannot write temporary file to disk.';
public $uploadExtensionErrorMessage = 'A PHP extension caused the upload to fail.';
- public $uploadErrorMessage = 'The file could not be uploaded.';
+ public $uploadErrorMessage = 'The file could not be uploaded.';
+
+ public function __construct($options = null)
+ {
+ parent::__construct($options);
+
+ if ($this->maxSize) {
+ if (ctype_digit((string) $this->maxSize)) {
+ $this->maxSize = (int) $this->maxSize;
+ $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
+ } elseif (preg_match('/^\d++k$/i', $this->maxSize)) {
+ $this->maxSize = $this->maxSize * 1000;
+ $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
+ } elseif (preg_match('/^\d++M$/i', $this->maxSize)) {
+ $this->maxSize = $this->maxSize * 1000000;
+ $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
+ } elseif (preg_match('/^\d++Ki$/i', $this->maxSize)) {
+ $this->maxSize = $this->maxSize << 10;
+ $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
+ } elseif (preg_match('/^\d++Mi$/i', $this->maxSize)) {
+ $this->maxSize = $this->maxSize << 20;
+ $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
+ } else {
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $this->maxSize));
+ }
+ }
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/FileValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/FileValidator.php
index acc80c9b079431f328caa24f4a3ef88f78ed32b4..9d225a9bbdebbdeabe003f43fc7c9bf40a8046de 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/FileValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -15,7 +15,6 @@
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
/**
@@ -26,13 +25,16 @@
class FileValidator extends ConstraintValidator
{
const KB_BYTES = 1000;
-
const MB_BYTES = 1000000;
+ const KIB_BYTES = 1024;
+ const MIB_BYTES = 1048576;
private static $suffices = array(
1 => 'bytes',
self::KB_BYTES => 'kB',
self::MB_BYTES => 'MB',
+ self::KIB_BYTES => 'KiB',
+ self::MIB_BYTES => 'MiB',
);
/**
@@ -51,54 +53,56 @@ public function validate($value, Constraint $constraint)
if ($value instanceof UploadedFile && !$value->isValid()) {
switch ($value->getError()) {
case UPLOAD_ERR_INI_SIZE:
- if ($constraint->maxSize) {
- if (ctype_digit((string) $constraint->maxSize)) {
- $limitInBytes = (int) $constraint->maxSize;
- } elseif (preg_match('/^\d++k$/', $constraint->maxSize)) {
- $limitInBytes = $constraint->maxSize * self::KB_BYTES;
- } elseif (preg_match('/^\d++M$/', $constraint->maxSize)) {
- $limitInBytes = $constraint->maxSize * self::MB_BYTES;
- } else {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $constraint->maxSize));
- }
- $limitInBytes = min(UploadedFile::getMaxFilesize(), $limitInBytes);
+ $iniLimitSize = UploadedFile::getMaxFilesize();
+ if ($constraint->maxSize && $constraint->maxSize < $iniLimitSize) {
+ $limitInBytes = $constraint->maxSize;
+ $binaryFormat = $constraint->binaryFormat;
} else {
- $limitInBytes = UploadedFile::getMaxFilesize();
+ $limitInBytes = $iniLimitSize;
+ $binaryFormat = true;
}
+ list($sizeAsString, $limitAsString, $suffix) = $this->factorizeSizes(0, $limitInBytes, $binaryFormat);
$this->buildViolation($constraint->uploadIniSizeErrorMessage)
- ->setParameter('{{ limit }}', $limitInBytes)
- ->setParameter('{{ suffix }}', 'bytes')
+ ->setParameter('{{ limit }}', $limitAsString)
+ ->setParameter('{{ suffix }}', $suffix)
+ ->setCode(UPLOAD_ERR_INI_SIZE)
->addViolation();
return;
case UPLOAD_ERR_FORM_SIZE:
$this->buildViolation($constraint->uploadFormSizeErrorMessage)
+ ->setCode(UPLOAD_ERR_FORM_SIZE)
->addViolation();
return;
case UPLOAD_ERR_PARTIAL:
$this->buildViolation($constraint->uploadPartialErrorMessage)
+ ->setCode(UPLOAD_ERR_PARTIAL)
->addViolation();
return;
case UPLOAD_ERR_NO_FILE:
$this->buildViolation($constraint->uploadNoFileErrorMessage)
+ ->setCode(UPLOAD_ERR_NO_FILE)
->addViolation();
return;
case UPLOAD_ERR_NO_TMP_DIR:
$this->buildViolation($constraint->uploadNoTmpDirErrorMessage)
+ ->setCode(UPLOAD_ERR_NO_TMP_DIR)
->addViolation();
return;
case UPLOAD_ERR_CANT_WRITE:
$this->buildViolation($constraint->uploadCantWriteErrorMessage)
+ ->setCode(UPLOAD_ERR_CANT_WRITE)
->addViolation();
return;
case UPLOAD_ERR_EXTENSION:
$this->buildViolation($constraint->uploadExtensionErrorMessage)
+ ->setCode(UPLOAD_ERR_EXTENSION)
->addViolation();
return;
@@ -120,6 +124,7 @@ public function validate($value, Constraint $constraint)
if (!is_file($path)) {
$this->buildViolation($constraint->notFoundMessage)
->setParameter('{{ file }}', $this->formatValue($path))
+ ->setCode(File::NOT_FOUND_ERROR)
->addViolation();
return;
@@ -128,52 +133,34 @@ public function validate($value, Constraint $constraint)
if (!is_readable($path)) {
$this->buildViolation($constraint->notReadableMessage)
->setParameter('{{ file }}', $this->formatValue($path))
+ ->setCode(File::NOT_READABLE_ERROR)
->addViolation();
return;
}
- if ($constraint->maxSize) {
- $sizeInBytes = filesize($path);
- $limitInBytes = (int) $constraint->maxSize;
-
- if (preg_match('/^\d++k$/', $constraint->maxSize)) {
- $limitInBytes *= self::KB_BYTES;
- } elseif (preg_match('/^\d++M$/', $constraint->maxSize)) {
- $limitInBytes *= self::MB_BYTES;
- } elseif (!ctype_digit((string) $constraint->maxSize)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $constraint->maxSize));
- }
+ $sizeInBytes = filesize($path);
- if ($sizeInBytes > $limitInBytes) {
- // Convert the limit to the smallest possible number
- // (i.e. try "MB", then "kB", then "bytes")
- $coef = self::MB_BYTES;
- $limitAsString = (string) ($limitInBytes / $coef);
-
- // Restrict the limit to 2 decimals (without rounding! we
- // need the precise value)
- while (self::moreDecimalsThan($limitAsString, 2)) {
- $coef /= 1000;
- $limitAsString = (string) ($limitInBytes / $coef);
- }
+ if (0 === $sizeInBytes) {
+ $this->buildViolation($constraint->disallowEmptyMessage)
+ ->setParameter('{{ file }}', $this->formatValue($path))
+ ->setCode(File::EMPTY_ERROR)
+ ->addViolation();
- // Convert size to the same measure, but round to 2 decimals
- $sizeAsString = (string) round($sizeInBytes / $coef, 2);
+ return;
+ }
- // If the size and limit produce the same string output
- // (due to rounding), reduce the coefficient
- while ($sizeAsString === $limitAsString) {
- $coef /= 1000;
- $limitAsString = (string) ($limitInBytes / $coef);
- $sizeAsString = (string) round($sizeInBytes / $coef, 2);
- }
+ if ($constraint->maxSize) {
+ $limitInBytes = $constraint->maxSize;
+ if ($sizeInBytes > $limitInBytes) {
+ list($sizeAsString, $limitAsString, $suffix) = $this->factorizeSizes($sizeInBytes, $limitInBytes, $constraint->binaryFormat);
$this->buildViolation($constraint->maxSizeMessage)
->setParameter('{{ file }}', $this->formatValue($path))
->setParameter('{{ size }}', $sizeAsString)
->setParameter('{{ limit }}', $limitAsString)
- ->setParameter('{{ suffix }}', self::$suffices[$coef])
+ ->setParameter('{{ suffix }}', $suffix)
+ ->setCode(File::TOO_LARGE_ERROR)
->addViolation();
return;
@@ -204,6 +191,7 @@ public function validate($value, Constraint $constraint)
->setParameter('{{ file }}', $this->formatValue($path))
->setParameter('{{ type }}', $this->formatValue($mime))
->setParameter('{{ types }}', $this->formatValues($mimeTypes))
+ ->setCode(File::INVALID_MIME_TYPE_ERROR)
->addViolation();
}
}
@@ -212,4 +200,41 @@ private static function moreDecimalsThan($double, $numberOfDecimals)
{
return strlen((string) $double) > strlen(round($double, $numberOfDecimals));
}
+
+ /**
+ * Convert the limit to the smallest possible number
+ * (i.e. try "MB", then "kB", then "bytes")
+ */
+ private function factorizeSizes($size, $limit, $binaryFormat)
+ {
+ if ($binaryFormat) {
+ $coef = self::MIB_BYTES;
+ $coefFactor = self::KIB_BYTES;
+ } else {
+ $coef = self::MB_BYTES;
+ $coefFactor = self::KB_BYTES;
+ }
+
+ $limitAsString = (string) ($limit / $coef);
+
+ // Restrict the limit to 2 decimals (without rounding! we
+ // need the precise value)
+ while (self::moreDecimalsThan($limitAsString, 2)) {
+ $coef /= $coefFactor;
+ $limitAsString = (string) ($limit / $coef);
+ }
+
+ // Convert size to the same measure, but round to 2 decimals
+ $sizeAsString = (string) round($size / $coef, 2);
+
+ // If the size and limit produce the same string output
+ // (due to rounding), reduce the coefficient
+ while ($sizeAsString === $limitAsString) {
+ $coef /= $coefFactor;
+ $limitAsString = (string) ($limit / $coef);
+ $sizeAsString = (string) round($size / $coef, 2);
+ }
+
+ return array($sizeAsString, $limitAsString, self::$suffices[$coef]);
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Iban.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Iban.php
index 895a93cd5860ea856d3aa853f7e0a9953007f1bd..66ce09ae1a6307b164b4cc9133e1eb5d5037e370 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Iban.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Iban.php
@@ -19,8 +19,23 @@
*
* @author Manuel Reinhard <manu@sprain.ch>
* @author Michael Schummel
+ * @author Bernhard Schussek <bschussek@gmail.com>
*/
class Iban extends Constraint
{
+ const TOO_SHORT_ERROR = 1;
+ const INVALID_COUNTRY_CODE_ERROR = 2;
+ const INVALID_CHARACTERS_ERROR = 3;
+ const INVALID_CASE_ERROR = 4;
+ const CHECKSUM_FAILED_ERROR = 5;
+
+ protected static $errorNames = array(
+ self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
+ self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR',
+ self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
+ self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
+ self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
+ );
+
public $message = 'This is not a valid International Bank Account Number (IBAN).';
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IbanValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IbanValidator.php
index b66561dc2ade1d7fd5f24d05072a194ef6ae7405..c8bcf4b1ab0966edaed114f3fa42725e36092901 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IbanValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IbanValidator.php
@@ -49,6 +49,7 @@ public function validate($value, Constraint $constraint)
if (strlen($canonicalized) < 4) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Iban::TOO_SHORT_ERROR)
->addViolation();
return;
@@ -58,6 +59,7 @@ public function validate($value, Constraint $constraint)
if (!ctype_alpha($canonicalized{0}) || !ctype_alpha($canonicalized{1})) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Iban::INVALID_COUNTRY_CODE_ERROR)
->addViolation();
return;
@@ -67,6 +69,7 @@ public function validate($value, Constraint $constraint)
if (!ctype_alnum($canonicalized)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Iban::INVALID_CHARACTERS_ERROR)
->addViolation();
return;
@@ -76,6 +79,7 @@ public function validate($value, Constraint $constraint)
if ($canonicalized !== strtoupper($canonicalized)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Iban::INVALID_CASE_ERROR)
->addViolation();
return;
@@ -99,6 +103,7 @@ public function validate($value, Constraint $constraint)
if (1 !== $this->bigModulo97($checkSum)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Iban::CHECKSUM_FAILED_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Image.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Image.php
index 707e2af312e01ff845f36266f7a137b33422e588..904ef97b492b13d7228c9352546a54b69c3f211c 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Image.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Image.php
@@ -16,18 +16,52 @@
* @Target({"PROPERTY", "METHOD", "ANNOTATION"})
*
* @author Benjamin Dulau <benjamin.dulau@gmail.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class Image extends File
{
+ // Don't reuse values used in File
+
+ const SIZE_NOT_DETECTED_ERROR = 10;
+ const TOO_WIDE_ERROR = 11;
+ const TOO_NARROW_ERROR = 12;
+ const TOO_HIGH_ERROR = 13;
+ const TOO_LOW_ERROR = 14;
+ const RATIO_TOO_BIG_ERROR = 15;
+ const RATIO_TOO_SMALL_ERROR = 16;
+ const SQUARE_NOT_ALLOWED_ERROR = 17;
+ const LANDSCAPE_NOT_ALLOWED_ERROR = 18;
+ const PORTRAIT_NOT_ALLOWED_ERROR = 19;
+
+ // Include the mapping from the base class
+
+ protected static $errorNames = array(
+ self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
+ self::NOT_READABLE_ERROR => 'NOT_READABLE_ERROR',
+ self::EMPTY_ERROR => 'EMPTY_ERROR',
+ self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
+ self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
+ self::SIZE_NOT_DETECTED_ERROR => 'SIZE_NOT_DETECTED_ERROR',
+ self::TOO_WIDE_ERROR => 'TOO_WIDE_ERROR',
+ self::TOO_NARROW_ERROR => 'TOO_NARROW_ERROR',
+ self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR',
+ self::TOO_LOW_ERROR => 'TOO_LOW_ERROR',
+ self::RATIO_TOO_BIG_ERROR => 'RATIO_TOO_BIG_ERROR',
+ self::RATIO_TOO_SMALL_ERROR => 'RATIO_TOO_SMALL_ERROR',
+ self::SQUARE_NOT_ALLOWED_ERROR => 'SQUARE_NOT_ALLOWED_ERROR',
+ self::LANDSCAPE_NOT_ALLOWED_ERROR => 'LANDSCAPE_NOT_ALLOWED_ERROR',
+ self::PORTRAIT_NOT_ALLOWED_ERROR => 'PORTRAIT_NOT_ALLOWED_ERROR',
+ );
+
public $mimeTypes = 'image/*';
- public $minWidth = null;
- public $maxWidth = null;
- public $maxHeight = null;
- public $minHeight = null;
- public $maxRatio = null;
- public $minRatio = null;
+ public $minWidth;
+ public $maxWidth;
+ public $maxHeight;
+ public $minHeight;
+ public $maxRatio;
+ public $minRatio;
public $allowSquare = true;
public $allowLandscape = true;
public $allowPortrait = true;
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ImageValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ImageValidator.php
index 4eaed687dc98548cfd15f6cb7e84381ec2d919f9..c0942da7b571ea03e21849b173227fc73e089f22 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ImageValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/ImageValidator.php
@@ -54,12 +54,13 @@ public function validate($value, Constraint $constraint)
if (empty($size) || ($size[0] === 0) || ($size[1] === 0)) {
$this->buildViolation($constraint->sizeNotDetectedMessage)
+ ->setCode(Image::SIZE_NOT_DETECTED_ERROR)
->addViolation();
return;
}
- $width = $size[0];
+ $width = $size[0];
$height = $size[1];
if ($constraint->minWidth) {
@@ -71,6 +72,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->minWidthMessage)
->setParameter('{{ width }}', $width)
->setParameter('{{ min_width }}', $constraint->minWidth)
+ ->setCode(Image::TOO_NARROW_ERROR)
->addViolation();
return;
@@ -86,6 +88,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->maxWidthMessage)
->setParameter('{{ width }}', $width)
->setParameter('{{ max_width }}', $constraint->maxWidth)
+ ->setCode(Image::TOO_WIDE_ERROR)
->addViolation();
return;
@@ -101,6 +104,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->minHeightMessage)
->setParameter('{{ height }}', $height)
->setParameter('{{ min_height }}', $constraint->minHeight)
+ ->setCode(Image::TOO_LOW_ERROR)
->addViolation();
return;
@@ -116,6 +120,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->maxHeightMessage)
->setParameter('{{ height }}', $height)
->setParameter('{{ max_height }}', $constraint->maxHeight)
+ ->setCode(Image::TOO_HIGH_ERROR)
->addViolation();
}
}
@@ -131,6 +136,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->minRatioMessage)
->setParameter('{{ ratio }}', $ratio)
->setParameter('{{ min_ratio }}', $constraint->minRatio)
+ ->setCode(Image::RATIO_TOO_SMALL_ERROR)
->addViolation();
}
}
@@ -144,6 +150,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->maxRatioMessage)
->setParameter('{{ ratio }}', $ratio)
->setParameter('{{ max_ratio }}', $constraint->maxRatio)
+ ->setCode(Image::RATIO_TOO_BIG_ERROR)
->addViolation();
}
}
@@ -152,6 +159,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->allowSquareMessage)
->setParameter('{{ width }}', $width)
->setParameter('{{ height }}', $height)
+ ->setCode(Image::SQUARE_NOT_ALLOWED_ERROR)
->addViolation();
}
@@ -159,6 +167,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->allowLandscapeMessage)
->setParameter('{{ width }}', $width)
->setParameter('{{ height }}', $height)
+ ->setCode(Image::LANDSCAPE_NOT_ALLOWED_ERROR)
->addViolation();
}
@@ -166,6 +175,7 @@ public function validate($value, Constraint $constraint)
$this->buildViolation($constraint->allowPortraitMessage)
->setParameter('{{ width }}', $width)
->setParameter('{{ height }}', $height)
+ ->setCode(Image::PORTRAIT_NOT_ALLOWED_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Isbn.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Isbn.php
index 90abedd2a8060929dd616f151ae8828f7e5cbf6e..67d177f4e0439704f719b6a8f964014b80eee7c2 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Isbn.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Isbn.php
@@ -19,9 +19,24 @@
*
* @author The Whole Life To Learn <thewholelifetolearn@gmail.com>
* @author Manuel Reinhard <manu@sprain.ch>
+ * @author Bernhard Schussek <bschussek@gmail.com>
*/
class Isbn extends Constraint
{
+ const TOO_SHORT_ERROR = 1;
+ const TOO_LONG_ERROR = 2;
+ const INVALID_CHARACTERS_ERROR = 3;
+ const CHECKSUM_FAILED_ERROR = 4;
+ const TYPE_NOT_RECOGNIZED_ERROR = 5;
+
+ protected static $errorNames = array(
+ self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
+ self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
+ self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
+ self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
+ self::TYPE_NOT_RECOGNIZED_ERROR => 'TYPE_NOT_RECOGNIZED_ERROR',
+ );
+
public $isbn10Message = 'This value is not a valid ISBN-10.';
public $isbn13Message = 'This value is not a valid ISBN-13.';
public $bothIsbnMessage = 'This value is neither a valid ISBN-10 nor a valid ISBN-13.';
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IsbnValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IsbnValidator.php
index 8972b91610406631a053ea491f110098c880226c..8a53fe7941d193adf467550c534abc13f07fdae4 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IsbnValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IsbnValidator.php
@@ -56,9 +56,10 @@ public function validate($value, Constraint $constraint)
// Explicitly validate against ISBN-10
if ('isbn10' === $constraint->type) {
- if (!$this->validateIsbn10($canonical)) {
+ if (true !== ($code = $this->validateIsbn10($canonical))) {
$this->buildViolation($this->getMessage($constraint, $constraint->type))
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode($code)
->addViolation();
}
@@ -67,9 +68,10 @@ public function validate($value, Constraint $constraint)
// Explicitly validate against ISBN-13
if ('isbn13' === $constraint->type) {
- if (!$this->validateIsbn13($canonical)) {
+ if (true !== ($code = $this->validateIsbn13($canonical))) {
$this->buildViolation($this->getMessage($constraint, $constraint->type))
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode($code)
->addViolation();
}
@@ -77,20 +79,49 @@ public function validate($value, Constraint $constraint)
}
// Try both ISBNs
- if (!$this->validateIsbn10($canonical) && !$this->validateIsbn13($canonical)) {
+
+ // First, try ISBN-10
+ $code = $this->validateIsbn10($canonical);
+
+ // The ISBN can only be an ISBN-13 if the value was too long for ISBN-10
+ if (Isbn::TOO_LONG_ERROR === $code) {
+ // Try ISBN-13 now
+ $code = $this->validateIsbn13($canonical);
+
+ // If too short, this means we have 11 or 12 digits
+ if (Isbn::TOO_SHORT_ERROR === $code) {
+ $code = Isbn::TYPE_NOT_RECOGNIZED_ERROR;
+ }
+ }
+
+ if (true !== $code) {
$this->buildViolation($this->getMessage($constraint))
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode($code)
->addViolation();
}
}
protected function validateIsbn10($isbn)
{
+ // Choose an algorithm so that ERROR_INVALID_CHARACTERS is preferred
+ // over ERROR_TOO_SHORT/ERROR_TOO_LONG
+ // Otherwise "0-45122-5244" passes, but "0-45122_5244" reports
+ // "too long"
+
+ // Error priority:
+ // 1. ERROR_INVALID_CHARACTERS
+ // 2. ERROR_TOO_SHORT/ERROR_TOO_LONG
+ // 3. ERROR_CHECKSUM_FAILED
+
$checkSum = 0;
for ($i = 0; $i < 10; ++$i) {
+ // If we test the length before the loop, we get an ERROR_TOO_SHORT
+ // when actually an ERROR_INVALID_CHARACTERS is wanted, e.g. for
+ // "0-45122_5244" (typo)
if (!isset($isbn{$i})) {
- return false;
+ return Isbn::TOO_SHORT_ERROR;
}
if ('X' === $isbn{$i}) {
@@ -98,33 +129,38 @@ protected function validateIsbn10($isbn)
} elseif (ctype_digit($isbn{$i})) {
$digit = $isbn{$i};
} else {
- return false;
+ return Isbn::INVALID_CHARACTERS_ERROR;
}
$checkSum += $digit * intval(10 - $i);
}
if (isset($isbn{$i})) {
- return false;
+ return Isbn::TOO_LONG_ERROR;
}
- return 0 === $checkSum % 11;
+ return 0 === $checkSum % 11 ? true : Isbn::CHECKSUM_FAILED_ERROR;
}
protected function validateIsbn13($isbn)
{
+ // Error priority:
+ // 1. ERROR_INVALID_CHARACTERS
+ // 2. ERROR_TOO_SHORT/ERROR_TOO_LONG
+ // 3. ERROR_CHECKSUM_FAILED
+
if (!ctype_digit($isbn)) {
- return false;
+ return Isbn::INVALID_CHARACTERS_ERROR;
}
$length = strlen($isbn);
if ($length < 13) {
- return false;
+ return Isbn::TOO_SHORT_ERROR;
}
if ($length > 13) {
- return false;
+ return Isbn::TOO_LONG_ERROR;
}
$checkSum = 0;
@@ -138,7 +174,7 @@ protected function validateIsbn13($isbn)
* 3;
}
- return 0 === $checkSum % 10;
+ return 0 === $checkSum % 10 ? true : Isbn::CHECKSUM_FAILED_ERROR;
}
protected function getMessage($constraint, $type = null)
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Issn.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Issn.php
index 01a0f4315f6b2411fe3adeffb1a622481d3f30c7..39716a28cce304f8706578f273ff53ab6a13a4ed 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Issn.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Issn.php
@@ -18,9 +18,26 @@
* @Target({"PROPERTY", "METHOD", "ANNOTATION"})
*
* @author Antonio J. GarcÃa Lagar <aj@garcialagar.es>
+ * @author Bernhard Schussek <bschussek@gmail.com>
*/
class Issn extends Constraint
{
+ const TOO_SHORT_ERROR = 1;
+ const TOO_LONG_ERROR = 2;
+ const MISSING_HYPHEN_ERROR = 3;
+ const INVALID_CHARACTERS_ERROR = 4;
+ const INVALID_CASE_ERROR = 5;
+ const CHECKSUM_FAILED_ERROR = 6;
+
+ protected static $errorNames = array(
+ self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
+ self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
+ self::MISSING_HYPHEN_ERROR => 'MISSING_HYPHEN_ERROR',
+ self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
+ self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
+ self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
+ );
+
public $message = 'This value is not a valid ISSN.';
public $caseSensitive = false;
public $requireHyphen = false;
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IssnValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IssnValidator.php
index 2ee8a53dfd7e5bb9bd45e038efc9cbe4ad871aee..e8f28e6a4fbcbc2cf64847dde974a14f6dcc27cd 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IssnValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/IssnValidator.php
@@ -53,6 +53,7 @@ public function validate($value, Constraint $constraint)
} elseif ($constraint->requireHyphen) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::MISSING_HYPHEN_ERROR)
->addViolation();
return;
@@ -63,6 +64,7 @@ public function validate($value, Constraint $constraint)
if ($length < 8) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::TOO_SHORT_ERROR)
->addViolation();
return;
@@ -71,6 +73,7 @@ public function validate($value, Constraint $constraint)
if ($length > 8) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::TOO_LONG_ERROR)
->addViolation();
return;
@@ -81,6 +84,7 @@ public function validate($value, Constraint $constraint)
if (!ctype_digit(substr($canonical, 0, 7))) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::INVALID_CHARACTERS_ERROR)
->addViolation();
return;
@@ -91,6 +95,7 @@ public function validate($value, Constraint $constraint)
if (!ctype_digit($canonical{7}) && 'x' !== $canonical{7} && 'X' !== $canonical{7}) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::INVALID_CHARACTERS_ERROR)
->addViolation();
return;
@@ -101,6 +106,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->caseSensitive && 'x' === $canonical{7}) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::INVALID_CASE_ERROR)
->addViolation();
return;
@@ -119,6 +125,7 @@ public function validate($value, Constraint $constraint)
if (0 !== $checkSum % 11) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Issn::CHECKSUM_FAILED_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Length.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Length.php
index b353e9b24d3fb582a648dd1e4a894c040edc8fc3..60a46cb8ea1fa34c8bbbdf4eb3044fc0329efc2f 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Length.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Length.php
@@ -24,6 +24,14 @@
*/
class Length extends Constraint
{
+ const TOO_SHORT_ERROR = 1;
+ const TOO_LONG_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
+ self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
+ );
+
public $maxMessage = 'This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.';
public $minMessage = 'This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.';
public $exactMessage = 'This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.';
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LengthValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LengthValidator.php
index cdc5bea985df355792eb8268a5696d51550beea7..19f3d3937b502d9c13673063a28b9ec6c1ed1c79 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LengthValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -53,6 +53,7 @@ public function validate($value, Constraint $constraint)
->setParameter('{{ limit }}', $constraint->max)
->setInvalidValue($value)
->setPlural((int) $constraint->max)
+ ->setCode(Length::TOO_LONG_ERROR)
->addViolation();
return;
@@ -64,6 +65,7 @@ public function validate($value, Constraint $constraint)
->setParameter('{{ limit }}', $constraint->min)
->setInvalidValue($value)
->setPlural((int) $constraint->min)
+ ->setCode(Length::TOO_SHORT_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Luhn.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Luhn.php
index e9b406adede159486fd9ce464203fcac17647720..24f5bc77ab76c8a3ed9a2bf393e4db16b3434ace 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Luhn.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Luhn.php
@@ -21,8 +21,17 @@
*
* @author Tim Nagel <t.nagel@infinite.net.au>
* @author Greg Knapp http://gregk.me/2011/php-implementation-of-bank-card-luhn-algorithm/
+ * @author Bernhard Schussek <bschussek@gmail.com>
*/
class Luhn extends Constraint
{
+ const INVALID_CHARACTERS_ERROR = 1;
+ const CHECKSUM_FAILED_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
+ self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
+ );
+
public $message = 'Invalid card number.';
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LuhnValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LuhnValidator.php
index c82d6d8917a07bed7f11c160b352423e909d24e7..d60b7f860559df5391a0737c495bf5b5f5515697 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LuhnValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/LuhnValidator.php
@@ -57,6 +57,7 @@ public function validate($value, Constraint $constraint)
if (!ctype_digit($value)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Luhn::INVALID_CHARACTERS_ERROR)
->addViolation();
return;
@@ -87,6 +88,7 @@ public function validate($value, Constraint $constraint)
if (0 === $checkSum || 0 !== $checkSum % 10) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Luhn::CHECKSUM_FAILED_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Range.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Range.php
index 067ffb8bf34dab3fd411f91e4e3eb9859705d00a..a12afffbedb8cd15859d7c299a3c5762365ecfab 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Range.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Range.php
@@ -24,6 +24,16 @@
*/
class Range extends Constraint
{
+ const INVALID_VALUE_ERROR = 1;
+ const BEYOND_RANGE_ERROR = 2;
+ const BELOW_RANGE_ERROR = 3;
+
+ protected static $errorNames = array(
+ self::INVALID_VALUE_ERROR => 'INVALID_VALUE_ERROR',
+ self::BEYOND_RANGE_ERROR => 'BEYOND_RANGE_ERROR',
+ self::BELOW_RANGE_ERROR => 'BELOW_RANGE_ERROR',
+ );
+
public $minMessage = 'This value should be {{ limit }} or more.';
public $maxMessage = 'This value should be {{ limit }} or less.';
public $invalidMessage = 'This value should be a valid number.';
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/RangeValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/RangeValidator.php
index 0abd0cb449972d18814a5dae9d7540687871c729..c0bde2b723450c5d46f0a9a198e7e49d14e37109 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/RangeValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/RangeValidator.php
@@ -33,27 +33,47 @@ public function validate($value, Constraint $constraint)
return;
}
- if (!is_numeric($value)) {
+ if (!is_numeric($value) && !$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
$this->buildViolation($constraint->invalidMessage)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Range::INVALID_VALUE_ERROR)
->addViolation();
return;
}
- if (null !== $constraint->max && $value > $constraint->max) {
+ $min = $constraint->min;
+ $max = $constraint->max;
+
+ // Convert strings to DateTimes if comparing another DateTime
+ // This allows to compare with any date/time value supported by
+ // the DateTime constructor:
+ // http://php.net/manual/en/datetime.formats.php
+ if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
+ if (is_string($min)) {
+ $min = new \DateTime($min);
+ }
+
+ if (is_string($max)) {
+ $max = new \DateTime($max);
+ }
+ }
+
+ if (null !== $constraint->max && $value > $max) {
$this->buildViolation($constraint->maxMessage)
->setParameter('{{ value }}', $value)
- ->setParameter('{{ limit }}', $constraint->max)
+ ->setParameter('{{ limit }}', $this->formatValue($max, self::PRETTY_DATE))
+ ->setCode(Range::BEYOND_RANGE_ERROR)
->addViolation();
return;
}
- if (null !== $constraint->min && $value < $constraint->min) {
+ if (null !== $constraint->min && $value < $min) {
$this->buildViolation($constraint->minMessage)
->setParameter('{{ value }}', $value)
- ->setParameter('{{ limit }}', $constraint->min)
+ ->setParameter('{{ limit }}', $this->formatValue($min, self::PRETTY_DATE))
+ ->setCode(Range::BELOW_RANGE_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Regex.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Regex.php
index aa4babba68e162295597332efb80ab6ea78d6b24..3820bcd28019f8b23c66f1783d8d211a46e9ee7c 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Regex.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Regex.php
@@ -25,7 +25,7 @@ class Regex extends Constraint
{
public $message = 'This value is not valid.';
public $pattern;
- public $htmlPattern = null;
+ public $htmlPattern;
public $match = true;
/**
@@ -44,23 +44,6 @@ public function getRequiredOptions()
return array('pattern');
}
- /**
- * Returns htmlPattern if exists or pattern is convertible.
- *
- * @return string|null
- */
- public function getHtmlPattern()
- {
- // If htmlPattern is specified, use it
- if (null !== $this->htmlPattern) {
- return empty($this->htmlPattern)
- ? null
- : $this->htmlPattern;
- }
-
- return $this->getNonDelimitedPattern();
- }
-
/**
* Converts the htmlPattern to a suitable format for HTML5 pattern.
* Example: /^[a-z]+$/ would be converted to [a-z]+
@@ -69,29 +52,47 @@ public function getHtmlPattern()
* Pattern is also ignored if match=false since the pattern should
* then be reversed before application.
*
- * @todo reverse pattern in case match=false as per issue #5307
- *
* @link http://dev.w3.org/html5/spec/single-page.html#the-pattern-attribute
*
* @return string|null
*/
- private function getNonDelimitedPattern()
+ public function getHtmlPattern()
{
- // If match = false, pattern should not be added to HTML5 validation
- if (!$this->match) {
+ // If htmlPattern is specified, use it
+ if (null !== $this->htmlPattern) {
+ return empty($this->htmlPattern)
+ ? null
+ : $this->htmlPattern;
+ }
+
+ // Quit if delimiters not at very beginning/end (e.g. when options are passed)
+ if ($this->pattern[0] !== $this->pattern[strlen($this->pattern) - 1]) {
return;
}
- if (preg_match('/^(.)(\^?)(.*?)(\$?)\1$/', $this->pattern, $matches)) {
- $delimiter = $matches[1];
- $start = empty($matches[2]) ? '.*' : '';
- $pattern = $matches[3];
- $end = empty($matches[4]) ? '.*' : '';
+ $delimiter = $this->pattern[0];
+
+ // Unescape the delimiter
+ $pattern = str_replace('\\'.$delimiter, $delimiter, substr($this->pattern, 1, -1));
- // Unescape the delimiter in pattern
- $pattern = str_replace('\\'.$delimiter, $delimiter, $pattern);
+ // If the pattern is inverted, we can simply wrap it in
+ // ((?!pattern).)*
+ if (!$this->match) {
+ return '((?!'.$pattern.').)*';
+ }
- return $start.$pattern.$end;
+ // If the pattern contains an or statement, wrap the pattern in
+ // .*(pattern).* and quit. Otherwise we'd need to parse the pattern
+ if (false !== strpos($pattern, '|')) {
+ return '.*('.$pattern.').*';
}
+
+ // Trim leading ^, otherwise prepend .*
+ $pattern = '^' === $pattern[0] ? substr($pattern, 1) : '.*'.$pattern;
+
+ // Trim trailing $, otherwise append .*
+ $pattern = '$' === $pattern[strlen($pattern) - 1] ? substr($pattern, 0, -1) : $pattern.'.*';
+
+ return $pattern;
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Time.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Time.php
index 42ede04325bea75c0f9b4e975ff17aab98770ec6..7998c6f9519b64fad4f9e79a59ce50aaf9a4ccfc 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Time.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Time.php
@@ -23,5 +23,13 @@
*/
class Time extends Constraint
{
+ const INVALID_FORMAT_ERROR = 1;
+ const INVALID_TIME_ERROR = 2;
+
+ protected static $errorNames = array(
+ self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
+ self::INVALID_TIME_ERROR => 'INVALID_TIME_ERROR',
+ );
+
public $message = 'This value is not a valid time.';
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/TimeValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/TimeValidator.php
index 3d52fbe43585c8f158297c5b978c6d7d152844fd..bfecf95b52fb9ae0757d34824fb84b00531141a7 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/TimeValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/TimeValidator.php
@@ -62,6 +62,7 @@ public function validate($value, Constraint $constraint)
if (!preg_match(static::PATTERN, $value, $matches)) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Time::INVALID_FORMAT_ERROR)
->addViolation();
return;
@@ -70,6 +71,7 @@ public function validate($value, Constraint $constraint)
if (!self::checkTime($matches[1], $matches[2], $matches[3])) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Time::INVALID_TIME_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Uuid.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Uuid.php
index dc73016401a1011021a38005eca0ffcf3aad4a22..3c67a3af0c163368ad2e560407f81297e4fbc0a7 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Uuid.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/Uuid.php
@@ -17,9 +17,26 @@
* @Annotation
*
* @author Colin O'Dell <colinodell@gmail.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
*/
class Uuid extends Constraint
{
+ const TOO_SHORT_ERROR = 1;
+ const TOO_LONG_ERROR = 2;
+ const INVALID_CHARACTERS_ERROR = 3;
+ const INVALID_HYPHEN_PLACEMENT_ERROR = 4;
+ const INVALID_VERSION_ERROR = 5;
+ const INVALID_VARIANT_ERROR = 6;
+
+ protected static $errorNames = array(
+ self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
+ self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
+ self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
+ self::INVALID_HYPHEN_PLACEMENT_ERROR => 'INVALID_HYPHEN_PLACEMENT_ERROR',
+ self::INVALID_VERSION_ERROR => 'INVALID_VERSION_ERROR',
+ self::INVALID_VARIANT_ERROR => 'INVALID_VARIANT_ERROR',
+ );
+
// Possible versions defined by RFC 4122
const V1_MAC = 1;
const V2_DCE = 2;
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/UuidValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/UuidValidator.php
index 5361f12de0f0aafbf2dbed00d1dcb8fa852248b1..0ae04e2694f37e5404b9977405e8d906be6a9787 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/UuidValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -26,28 +26,49 @@
*/
class UuidValidator extends ConstraintValidator
{
+ // The strict pattern matches UUIDs like this:
+ // xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
+
+ // Roughly speaking:
+ // x = any hexadecimal character
+ // M = any allowed version {1..5}
+ // N = any allowed variant {8, 9, a, b}
+
+ const STRICT_LENGTH = 36;
+ const STRICT_FIRST_HYPHEN_POSITION = 8;
+ const STRICT_LAST_HYPHEN_POSITION = 23;
+ const STRICT_VERSION_POSITION = 14;
+ const STRICT_VARIANT_POSITION = 19;
+
+ // The loose pattern validates similar yet non-compliant UUIDs.
+ // Hyphens are completely optional. If present, they should only appear
+ // between every fourth character:
+ // xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx
+ // xxxxxxxxxxxx-xxxx-xxxx-xxxx-xxxx-xxxx
+ // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+ // The value can also be wrapped with characters like []{}:
+ // {xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx}
+
+ // Neither the version nor the variant is validated by this pattern.
+
+ const LOOSE_MAX_LENGTH = 39;
+ const LOOSE_FIRST_HYPHEN_POSITION = 4;
+
/**
- * Regular expression which verifies allowed characters and the proper format.
- *
- * The strict pattern matches UUIDs like this: xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
- * Roughly speaking: x = any hexadecimal character, M = any allowed version, N = any allowed variant.
+ * @deprecated Deprecated since Symfony 2.6, to be removed in 3.0
*/
const STRICT_PATTERN = '/^[a-f0-9]{8}-[a-f0-9]{4}-[%s][a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$/i';
/**
- * The loose pattern validates similar yet non-compliant UUIDs.
- *
- * Dashes are completely optional. If present, they should only appear between every fourth character.
- * The value can also be wrapped with characters like []{} for backwards-compatibility with other systems.
- * Neither the version nor the variant is validated by this pattern.
+ * @deprecated Deprecated since Symfony 2.6, to be removed in 3.0
*/
const LOOSE_PATTERN = '/^[a-f0-9]{4}(?:-?[a-f0-9]{4}){7}$/i';
/**
- * Properly-formatted UUIDs contain 32 hex digits, separated by 4 dashes.
- * We can use this fact to avoid performing a preg_match on strings of other sizes.
+ * @deprecated Deprecated since Symfony 2.6, to be removed in 3.0
*/
- const STRICT_UUID_LENGTH = 36;
+ const STRICT_UUID_LENGTH = self::STRICT_LENGTH;
/**
* {@inheritdoc}
@@ -65,42 +86,178 @@ public function validate($value, Constraint $constraint)
$value = (string) $value;
if ($constraint->strict) {
- $length = strlen($value);
+ $this->validateStrict($value, $constraint);
+
+ return;
+ }
+
+ $this->validateLoose($value, $constraint);
+ }
+
+ private function validateLoose($value, Uuid $constraint)
+ {
+ // Error priority:
+ // 1. ERROR_INVALID_CHARACTERS
+ // 2. ERROR_INVALID_HYPHEN_PLACEMENT
+ // 3. ERROR_TOO_SHORT/ERROR_TOO_LONG
+
+ // Trim any wrapping characters like [] or {} used by some legacy systems
+ $trimmed = trim($value, '[]{}');
+
+ // Position of the next expected hyphen
+ $h = self::LOOSE_FIRST_HYPHEN_POSITION;
- if ($length < static::STRICT_UUID_LENGTH) {
+ // Expected length
+ $l = self::LOOSE_MAX_LENGTH;
+
+ for ($i = 0; $i < $l; ++$i) {
+ // Check length
+ if (!isset($trimmed{$i})) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::TOO_SHORT_ERROR)
->addViolation();
return;
}
- if ($length > static::STRICT_UUID_LENGTH) {
+ // Hyphens must occur every fifth position
+ // xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx
+ // ^ ^ ^ ^ ^ ^ ^
+ if ('-' === $trimmed{$i}) {
+ if ($i !== $h) {
+ $this->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
+ ->addViolation();
+
+ return;
+ }
+
+ $h += 5;
+
+ continue;
+ }
+
+ // Missing hyphens are ignored
+ if ($i === $h) {
+ $h += 4;
+ --$l;
+ }
+
+ // Check characters
+ if (!ctype_xdigit($trimmed{$i})) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
->addViolation();
return;
}
+ }
+
+ // Check length again
+ if (isset($trimmed{$i})) {
+ $this->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::TOO_LONG_ERROR)
+ ->addViolation();
+ }
+ }
- // Insert the allowed versions into the regular expression
- $pattern = sprintf(static::STRICT_PATTERN, implode('', $constraint->versions));
+ private function validateStrict($value, Uuid $constraint)
+ {
+ // Error priority:
+ // 1. ERROR_INVALID_CHARACTERS
+ // 2. ERROR_INVALID_HYPHEN_PLACEMENT
+ // 3. ERROR_TOO_SHORT/ERROR_TOO_LONG
+ // 4. ERROR_INVALID_VERSION
+ // 5. ERROR_INVALID_VARIANT
- if (!preg_match($pattern, $value)) {
+ // Position of the next expected hyphen
+ $h = self::STRICT_FIRST_HYPHEN_POSITION;
+
+ for ($i = 0; $i < self::STRICT_LENGTH; ++$i) {
+ // Check length
+ if (!isset($value{$i})) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::TOO_SHORT_ERROR)
->addViolation();
+
+ return;
}
- return;
+ // Check hyphen placement
+ // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+ // ^ ^ ^ ^
+ if ('-' === $value{$i}) {
+ if ($i !== $h) {
+ $this->buildViolation($constraint->message)
+ ->setParameter(
+ '{{ value }}',
+ $this->formatValue($value)
+ )
+ ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
+ ->addViolation();
+
+ return;
+ }
+
+ // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+ // ^
+ if ($h < self::STRICT_LAST_HYPHEN_POSITION) {
+ $h += 5;
+ }
+
+ continue;
+ }
+
+ // Check characters
+ if (!ctype_xdigit($value{$i})) {
+ $this->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
+ ->addViolation();
+
+ return;
+ }
+
+ // Missing hyphen
+ if ($i === $h) {
+ $this->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
+ ->addViolation();
+
+ return;
+ }
}
- // Trim any wrapping characters like [] or {} used by some legacy systems
- $value = trim($value, '[]{}');
+ // Check length again
+ if (isset($value{$i})) {
+ $this->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::TOO_LONG_ERROR)
+ ->addViolation();
+ }
+
+ // Check version
+ if (!in_array($value{self::STRICT_VERSION_POSITION}, $constraint->versions)) {
+ $this->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::INVALID_VERSION_ERROR)
+ ->addViolation();
+ }
- if (!preg_match(static::LOOSE_PATTERN, $value)) {
+ // Check variant - first two bits must equal "10"
+ // 0b10xx
+ // & 0b1100 (12)
+ // = 0b1000 (8)
+ if ((hexdec($value{self::STRICT_VARIANT_POSITION}) & 12) !== 8) {
$this->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
+ ->setCode(Uuid::INVALID_VARIANT_ERROR)
->addViolation();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContext.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContext.php
index a30382d3b7c2fdf6fb9e7d85510d72961d7a8fb0..8934a42e62a7f99a36d08cb25855a417b9cfdeb3 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContext.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -13,6 +13,7 @@
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\ClassBasedInterface;
+use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\Exception\BadMethodCallException;
@@ -88,7 +89,7 @@ class ExecutionContext implements ExecutionContextInterface
/**
* The current validation metadata.
*
- * @var MetadataInterface
+ * @var MetadataInterface|null
*/
private $metadata;
@@ -99,6 +100,13 @@ class ExecutionContext implements ExecutionContextInterface
*/
private $group;
+ /**
+ * The currently validated constraint.
+ *
+ * @var Constraint|null
+ */
+ private $constraint;
+
/**
* Stores which objects have been validated in which group.
*
@@ -162,6 +170,14 @@ public function setGroup($group)
$this->group = $group;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function setConstraint(Constraint $constraint)
+ {
+ $this->constraint = $constraint;
+ }
+
/**
* {@inheritdoc}
*/
@@ -186,7 +202,8 @@ public function addViolation($message, array $parameters = array(), $invalidValu
$this->propertyPath,
$this->value,
null,
- null
+ null,
+ $this->constraint
));
}
@@ -197,6 +214,7 @@ public function buildViolation($message, array $parameters = array())
{
return new ConstraintViolationBuilder(
$this->violations,
+ $this->constraint,
$message,
$parameters,
$this->root,
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContextInterface.php
index f63ce15261298f4c6976dcdda964ec60b0a1812f..cd4bae6057f678e9af0534712c0ceb01f7012998 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Context;
+use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ExecutionContextInterface as LegacyExecutionContextInterface;
use Symfony\Component\Validator\Mapping\MetadataInterface;
use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -136,6 +137,16 @@ public function setNode($value, $object, MetadataInterface $metadata = null, $pr
*/
public function setGroup($group);
+ /**
+ * Sets the currently validated constraint.
+ *
+ * @param Constraint $constraint The validated constraint
+ *
+ * @internal Used by the validator engine. Should not be called by user
+ * code.
+ */
+ public function setConstraint(Constraint $constraint);
+
/**
* Marks an object as validated in a specific validation group.
*
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php
index 07a2662ba19cb7a976540da074568ea8fa2fdec6..862e197dee84c178eb0e097b347de1d6d2a93c63 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -158,7 +158,7 @@ public function accept(ValidationVisitorInterface $visitor, $value, $group, $pro
$pathPrefix = empty($propertyPath) ? '' : $propertyPath.'.';
foreach ($this->getConstrainedProperties() as $property) {
- foreach ($this->getMemberMetadatas($property) as $member) {
+ foreach ($this->getPropertyMetadata($property) as $member) {
$member->accept($visitor, $member->getPropertyValue($value), $group, $pathPrefix.$property, $propagatedGroup);
}
}
@@ -266,7 +266,7 @@ public function addPropertyConstraint($property, Constraint $constraint)
if (!isset($this->properties[$property])) {
$this->properties[$property] = new PropertyMetadata($this->getClassName(), $property);
- $this->addMemberMetadata($this->properties[$property]);
+ $this->addPropertyMetadata($this->properties[$property]);
}
$constraint->addImplicitGroupName($this->getDefaultGroup());
@@ -276,6 +276,21 @@ public function addPropertyConstraint($property, Constraint $constraint)
return $this;
}
+ /**
+ * @param string $property
+ * @param Constraint[] $constraints
+ *
+ * @return ClassMetadata
+ */
+ public function addPropertyConstraints($property, array $constraints)
+ {
+ foreach ($constraints as $constraint) {
+ $this->addPropertyConstraint($property, $constraint);
+ }
+
+ return $this;
+ }
+
/**
* Adds a constraint to the getter of the given property.
*
@@ -292,7 +307,7 @@ public function addGetterConstraint($property, Constraint $constraint)
if (!isset($this->getters[$property])) {
$this->getters[$property] = new GetterMetadata($this->getClassName(), $property);
- $this->addMemberMetadata($this->getters[$property]);
+ $this->addPropertyMetadata($this->getters[$property]);
}
$constraint->addImplicitGroupName($this->getDefaultGroup());
@@ -302,6 +317,21 @@ public function addGetterConstraint($property, Constraint $constraint)
return $this;
}
+ /**
+ * @param string $property
+ * @param Constraint[] $constraints
+ *
+ * @return ClassMetadata
+ */
+ public function addGetterConstraints($property, array $constraints)
+ {
+ foreach ($constraints as $constraint) {
+ $this->addGetterConstraint($property, $constraint);
+ }
+
+ return $this;
+ }
+
/**
* Merges the constraints of the given metadata into this object.
*
@@ -314,16 +344,16 @@ public function mergeConstraints(ClassMetadata $source)
}
foreach ($source->getConstrainedProperties() as $property) {
- foreach ($source->getMemberMetadatas($property) as $member) {
+ foreach ($source->getPropertyMetadata($property) as $member) {
$member = clone $member;
foreach ($member->getConstraints() as $constraint) {
$constraint->addImplicitGroupName($this->getDefaultGroup());
}
- $this->addMemberMetadata($member);
+ $this->addPropertyMetadata($member);
- if (!$member->isPrivate($this->name)) {
+ if ($member instanceof MemberMetadata && !$member->isPrivate($this->name)) {
$property = $member->getPropertyName();
if ($member instanceof PropertyMetadata && !isset($this->properties[$property])) {
@@ -340,12 +370,12 @@ public function mergeConstraints(ClassMetadata $source)
* Adds a member metadata.
*
* @param MemberMetadata $metadata
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0.
*/
protected function addMemberMetadata(MemberMetadata $metadata)
{
- $property = $metadata->getPropertyName();
-
- $this->members[$property][] = $metadata;
+ $this->addPropertyMetadata($metadata);
}
/**
@@ -354,10 +384,12 @@ protected function addMemberMetadata(MemberMetadata $metadata)
* @param string $property The name of the property
*
* @return bool
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use {@link hasPropertyMetadata} instead.
*/
public function hasMemberMetadatas($property)
{
- return array_key_exists($property, $this->members);
+ return $this->hasPropertyMetadata($property);
}
/**
@@ -366,14 +398,12 @@ public function hasMemberMetadatas($property)
* @param string $property The name of the property
*
* @return MemberMetadata[] An array of MemberMetadata
+ *
+ * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use {@link getPropertyMetadata} instead.
*/
public function getMemberMetadatas($property)
{
- if (!isset($this->members[$property])) {
- return array();
- }
-
- return $this->members[$property];
+ return $this->getPropertyMetadata($property);
}
/**
@@ -503,4 +533,16 @@ public function getCascadingStrategy()
{
return CascadingStrategy::NONE;
}
+
+ /**
+ * Adds a property metadata.
+ *
+ * @param PropertyMetadataInterface $metadata
+ */
+ private function addPropertyMetadata(PropertyMetadataInterface $metadata)
+ {
+ $property = $metadata->getPropertyName();
+
+ $this->members[$property][] = $metadata;
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index eb0f3c460e09f364bc9fa92f8c508d7dbd4db484..b6ef076bd8e256ca9b00edeacc9ede7f5b83b424 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -15,7 +15,6 @@
use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
-use Symfony\Component\Validator\Mapping\MetadataInterface;
/**
* Creates new {@link ClassMetadataInterface} instances.
@@ -42,14 +41,14 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
/**
* The loader for loading the class metadata
*
- * @var LoaderInterface
+ * @var LoaderInterface|null
*/
protected $loader;
/**
* The cache for caching class metadata
*
- * @var CacheInterface
+ * @var CacheInterface|null
*/
protected $cache;
@@ -74,7 +73,7 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach
}
/**
- * Returns the metadata for the given class name or object.
+ * {@inheritdoc}
*
* If the method was called with the same class name (or an object of that
* class) before, the same metadata instance is returned.
@@ -87,12 +86,6 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach
* configured with a loader, the metadata is passed to the
* {@link LoaderInterface::loadClassMetadata()} method for further
* configuration. At last, the new object is returned.
- *
- * @param string|object $value A class name or an object
- *
- * @return MetadataInterface The metadata for the value
- *
- * @throws NoSuchMetadataException If no metadata exists for the given value
*/
public function getMetadataFor($value)
{
@@ -141,12 +134,7 @@ public function getMetadataFor($value)
}
/**
- * Returns whether the factory is able to return metadata for the given
- * class name or object.
- *
- * @param string|object $value A class name or an object
- *
- * @return bool Whether metadata can be returned for that class
+ * {@inheritdoc}
*/
public function hasMetadataFor($value)
{
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/GenericMetadata.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/GenericMetadata.php
index 01a6c3226ac06c3deb8bb92f7f7df25b544e45a7..904dcd768862f18d8f5e4a224301c10409168056 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/GenericMetadata.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/GenericMetadata.php
@@ -180,9 +180,7 @@ public function addConstraints(array $constraints)
}
/**
- * Returns all constraints of this element.
- *
- * @return Constraint[] A list of Constraint instances
+ * {@inheritdoc}
*/
public function getConstraints()
{
@@ -200,12 +198,9 @@ public function hasConstraints()
}
/**
- * Returns the constraints of the given group and global ones (* group).
- *
- * @param string $group The group name
+ * {@inheritdoc}
*
- * @return Constraint[] An list of all the Constraint instances belonging
- * to the group
+ * Aware of the global group (* group).
*/
public function findConstraints($group)
{
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
index b9ddaa3505a2993fd1a53241e7213db487f32d68..5d63f40184372b8ab731ec3b8f4d649951442005 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
@@ -20,9 +20,9 @@ class XmlFileLoader extends FileLoader
/**
* An array of SimpleXMLElement instances.
*
- * @var \SimpleXMLElement[]
+ * @var \SimpleXMLElement[]|null
*/
- protected $classes = null;
+ protected $classes;
/**
* {@inheritdoc}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/MetadataInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/MetadataInterface.php
index a72d4a5801c92d0bbb3a2a4ba3262f41d1f13371..28c355df71d50f858887ade89ecb9727dc2f1956 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/MetadataInterface.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/MetadataInterface.php
@@ -48,4 +48,11 @@ public function getCascadingStrategy();
* @see TraversalStrategy
*/
public function getTraversalStrategy();
+
+ /**
+ * Returns all constraints of this element.
+ *
+ * @return Constraint[] A list of Constraint instances
+ */
+ public function getConstraints();
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/README.md b/core/vendor/symfony/validator/Symfony/Component/Validator/README.md
index 6825a2feee19832cd86158ffe79eb306c1532d79..dc4e7830580cb407f1b7e29262591a7350ee5b0c 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/README.md
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/README.md
@@ -12,12 +12,14 @@ The component provides "validation constraints", which are simple objects
containing the rules for the validation. Let's validate a simple string
as an example:
- use Symfony\Component\Validator\Validation;
- use Symfony\Component\Validator\Constraints\Length;
+```php
+use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\Constraints\Length;
- $validator = Validation::createValidator();
+$validator = Validation::createValidator();
- $violations = $validator->validateValue('Bernhard', new Length(array('min' => 10)));
+$violations = $validator->validateValue('Bernhard', new Length(array('min' => 10)));
+```
This validation will fail because the given string is shorter than ten
characters. The precise errors, here called "constraint violations", are
@@ -26,24 +28,26 @@ If the violation list is empty, validation succeeded.
Validation of arrays is possible using the `Collection` constraint:
- use Symfony\Component\Validator\Validation;
- use Symfony\Component\Validator\Constraints as Assert;
+```php
+use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\Constraints as Assert;
- $validator = Validation::createValidator();
+$validator = Validation::createValidator();
- $constraint = new Assert\Collection(array(
- 'name' => new Assert\Collection(array(
- 'first_name' => new Assert\Length(array('min' => 101)),
- 'last_name' => new Assert\Length(array('min' => 1)),
- )),
- 'email' => new Assert\Email(),
- 'simple' => new Assert\Length(array('min' => 102)),
- 'gender' => new Assert\Choice(array(3, 4)),
- 'file' => new Assert\File(),
- 'password' => new Assert\Length(array('min' => 60)),
- ));
+$constraint = new Assert\Collection(array(
+ 'name' => new Assert\Collection(array(
+ 'first_name' => new Assert\Length(array('min' => 101)),
+ 'last_name' => new Assert\Length(array('min' => 1)),
+ )),
+ 'email' => new Assert\Email(),
+ 'simple' => new Assert\Length(array('min' => 102)),
+ 'gender' => new Assert\Choice(array(3, 4)),
+ 'file' => new Assert\File(),
+ 'password' => new Assert\Length(array('min' => 60)),
+));
- $violations = $validator->validateValue($input, $constraint);
+$violations = $validator->validateValue($input, $constraint);
+```
Again, the validator returns the list of violations.
@@ -52,45 +56,47 @@ a mapping you can put constraints onto properties and objects of classes.
Whenever an object of this class is validated, its properties and
method results are matched against the constraints.
- use Symfony\Component\Validator\Validation;
- use Symfony\Component\Validator\Constraints as Assert;
+```php
+use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class User
+{
+ /**
+ * @Assert\Length(min = 3)
+ * @Assert\NotBlank
+ */
+ private $name;
+
+ /**
+ * @Assert\Email
+ * @Assert\NotBlank
+ */
+ private $email;
+
+ public function __construct($name, $email)
+ {
+ $this->name = $name;
+ $this->email = $email;
+ }
- class User
+ /**
+ * @Assert\True(message = "The user should have a Google Mail account")
+ */
+ public function isGmailUser()
{
- /**
- * @Assert\Length(min = 3)
- * @Assert\NotBlank
- */
- private $name;
-
- /**
- * @Assert\Email
- * @Assert\NotBlank
- */
- private $email;
-
- public function __construct($name, $email)
- {
- $this->name = $name;
- $this->email = $email;
- }
-
- /**
- * @Assert\True(message = "The user should have a Google Mail account")
- */
- public function isGmailUser()
- {
- return false !== strpos($this->email, '@gmail.com');
- }
+ return false !== strpos($this->email, '@gmail.com');
}
+}
- $validator = Validation::createValidatorBuilder()
- ->enableAnnotationMapping()
- ->getValidator();
+$validator = Validation::createValidatorBuilder()
+ ->enableAnnotationMapping()
+ ->getValidator();
- $user = new User('John Doe', 'john@example.com');
+$user = new User('John Doe', 'john@example.com');
- $violations = $validator->validate($user);
+$violations = $validator->validate($user);
+```
This example uses the annotation support of Doctrine Common to
map constraints to properties and methods. You can also map constraints
@@ -107,7 +113,7 @@ https://github.com/fabpot/Silex/blob/master/src/Silex/Provider/ValidatorServiceP
Documentation:
-http://symfony.com/doc/2.5/book/validation.html
+http://symfony.com/doc/2.6/book/validation.html
JSR-303 Specification:
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ConstraintTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ConstraintTest.php
index 24e84b919c4193aa453929873f419aa22507ff15..f63570c5d2944d5cd32c371ad4d1644dad9b3eeb 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ConstraintTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ConstraintTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests;
+use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
@@ -154,4 +155,55 @@ public function testGetTargetsCanBeArray()
$this->assertEquals(array('property', 'class'), $constraint->getTargets());
}
+
+ public function testSerialize()
+ {
+ $constraint = new ConstraintA(array(
+ 'property1' => 'foo',
+ 'property2' => 'bar',
+ ));
+
+ $restoredConstraint = unserialize(serialize($constraint));
+
+ $this->assertEquals($constraint, $restoredConstraint);
+ }
+
+ public function testSerializeInitializesGroupsOptionToDefault()
+ {
+ $constraint = new ConstraintA(array(
+ 'property1' => 'foo',
+ 'property2' => 'bar',
+ ));
+
+ $constraint = unserialize(serialize($constraint));
+
+ $expected = new ConstraintA(array(
+ 'property1' => 'foo',
+ 'property2' => 'bar',
+ 'groups' => 'Default',
+ ));
+
+ $this->assertEquals($expected, $constraint);
+ }
+
+ public function testSerializeKeepsCustomGroups()
+ {
+ $constraint = new ConstraintA(array(
+ 'property1' => 'foo',
+ 'property2' => 'bar',
+ 'groups' => 'MyGroup',
+ ));
+
+ $constraint = unserialize(serialize($constraint));
+
+ $this->assertSame(array('MyGroup'), $constraint->groups);
+ }
+
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\InvalidArgumentException
+ */
+ public function testGetErrorNameForUnknownCode()
+ {
+ Constraint::getErrorName(1);
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
index b7117cc4ea1a7a4d8012292f6e9846674b67ca84..3503fcf4bcabc3c853b7b50ceb00b74e3544d8d1 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -34,6 +34,40 @@ public function __toString()
*/
abstract class AbstractComparisonValidatorTestCase extends AbstractConstraintValidatorTest
{
+ protected static function addPhp5Dot5Comparisons(array $comparisons)
+ {
+ if (version_compare(PHP_VERSION, '5.5.0-dev', '<')) {
+ return $comparisons;
+ }
+
+ $result = $comparisons;
+
+ // Duplicate all tests involving DateTime objects to be tested with
+ // DateTimeImmutable objects as well
+ foreach ($comparisons as $comparison) {
+ $add = false;
+
+ foreach ($comparison as $i => $value) {
+ if ($value instanceof \DateTime) {
+ $comparison[$i] = new \DateTimeImmutable(
+ $value->format('Y-m-d H:i:s.u e'),
+ $value->getTimezone()
+ );
+ $add = true;
+ } elseif ('DateTime' === $value) {
+ $comparison[$i] = 'DateTimeImmutable';
+ $add = true;
+ }
+ }
+
+ if ($add) {
+ $result[] = $comparison;
+ }
+ }
+
+ return $result;
+ }
+
/**
* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
*/
@@ -45,7 +79,7 @@ public function testThrowsConstraintExceptionIfNoValueOrProperty()
}
/**
- * @dataProvider provideValidComparisons
+ * @dataProvider provideAllValidComparisons
* @param mixed $dirtyValue
* @param mixed $comparisonValue
*/
@@ -58,13 +92,29 @@ public function testValidComparisonToValue($dirtyValue, $comparisonValue)
$this->assertNoViolation();
}
+ /**
+ * @return array
+ */
+ public function provideAllValidComparisons()
+ {
+ // The provider runs before setUp(), so we need to manually fix
+ // the default timezone
+ $this->setDefaultTimezone('UTC');
+
+ $comparisons = self::addPhp5Dot5Comparisons($this->provideValidComparisons());
+
+ $this->restoreDefaultTimezone();
+
+ return $comparisons;
+ }
+
/**
* @return array
*/
abstract public function provideValidComparisons();
/**
- * @dataProvider provideInvalidComparisons
+ * @dataProvider provideAllInvalidComparisons
* @param mixed $dirtyValue
* @param mixed $dirtyValueAsString
* @param mixed $comparedValue
@@ -75,7 +125,7 @@ public function testInvalidComparisonToValue($dirtyValue, $dirtyValueAsString, $
{
// Conversion of dates to string differs between ICU versions
// Make sure we have the correct version loaded
- if ($dirtyValue instanceof \DateTime) {
+ if ($dirtyValue instanceof \DateTime || $dirtyValue instanceof \DateTimeInterface) {
IntlTestHelper::requireIntl($this);
}
@@ -91,6 +141,22 @@ public function testInvalidComparisonToValue($dirtyValue, $dirtyValueAsString, $
->assertRaised();
}
+ /**
+ * @return array
+ */
+ public function provideAllInvalidComparisons()
+ {
+ // The provider runs before setUp(), so we need to manually fix
+ // the default timezone
+ $this->setDefaultTimezone('UTC');
+
+ $comparisons = self::addPhp5Dot5Comparisons($this->provideInvalidComparisons());
+
+ $this->restoreDefaultTimezone();
+
+ return $comparisons;
+ }
+
/**
* @return array
*/
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
index 53a9f21aa86a3ee7d3a5849d394bbd035026dc46..762dac553be0ba83c4f0e0de69d185632d8af37c 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\ConstraintValidatorInterface;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\Context\ExecutionContext;
@@ -50,6 +52,10 @@ abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCa
protected $propertyPath;
+ protected $constraint;
+
+ protected $defaultTimezone;
+
protected function setUp()
{
$this->group = 'MyGroup';
@@ -58,11 +64,45 @@ protected function setUp()
$this->value = 'InvalidValue';
$this->root = 'root';
$this->propertyPath = 'property.path';
+
+ // Initialize the context with some constraint so that we can
+ // successfully build a violation.
+ // The 2.4 API does not keep a reference to the current
+ // constraint yet. There the violation stores null.
+ $this->constraint = Validation::API_VERSION_2_4 === $this->getApiVersion()
+ ? null
+ : new NotNull();
+
$this->context = $this->createContext();
$this->validator = $this->createValidator();
$this->validator->initialize($this->context);
\Locale::setDefault('en');
+
+ $this->setDefaultTimezone('UTC');
+ }
+
+ protected function tearDown()
+ {
+ $this->restoreDefaultTimezone();
+ }
+
+ protected function setDefaultTimezone($defaultTimezone)
+ {
+ // Make sure this method can not be called twice before calling
+ // also restoreDefaultTimezone()
+ if (null === $this->defaultTimezone) {
+ $this->defaultTimezone = date_default_timezone_get();
+ date_default_timezone_set($defaultTimezone);
+ }
+ }
+
+ protected function restoreDefaultTimezone()
+ {
+ if (null !== $this->defaultTimezone) {
+ date_default_timezone_set($this->defaultTimezone);
+ $this->defaultTimezone = null;
+ }
}
protected function createContext()
@@ -109,6 +149,7 @@ protected function createContext()
$context->setGroup($this->group);
$context->setNode($this->value, $this->object, $this->metadata, $this->propertyPath);
+ $context->setConstraint($this->constraint);
$validator->expects($this->any())
->method('inContext')
@@ -141,7 +182,8 @@ protected function createViolation($message, array $parameters = array(), $prope
$propertyPath,
$invalidValue,
$plural,
- $code
+ $code,
+ $this->constraint
);
}
@@ -280,7 +322,7 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
}
}
- protected function expectValidateValueAt($i, $propertyPath, $value, $constraints, $group)
+ protected function expectValidateValueAt($i, $propertyPath, $value, $constraints, $group = null)
{
switch ($this->getApiVersion()) {
case Validation::API_VERSION_2_4:
@@ -355,7 +397,7 @@ protected function assertViolations(array $expected)
*/
protected function buildViolation($message)
{
- return new ConstraintViolationAssertion($this->context, $message);
+ return new ConstraintViolationAssertion($this->context, $message, $this->constraint);
}
abstract protected function getApiVersion();
@@ -385,11 +427,14 @@ class ConstraintViolationAssertion
private $translationDomain;
private $plural;
private $code;
+ private $constraint;
+ private $cause;
- public function __construct(LegacyExecutionContextInterface $context, $message, array $assertions = array())
+ public function __construct(LegacyExecutionContextInterface $context, $message, Constraint $constraint = null, array $assertions = array())
{
$this->context = $context;
$this->message = $message;
+ $this->constraint = $constraint;
$this->assertions = $assertions;
}
@@ -442,12 +487,19 @@ public function setCode($code)
return $this;
}
+ public function setCause($cause)
+ {
+ $this->cause = $cause;
+
+ return $this;
+ }
+
public function buildNextViolation($message)
{
$assertions = $this->assertions;
$assertions[] = $this;
- return new self($this->context, $message, $assertions);
+ return new self($this->context, $message, $this->constraint, $assertions);
}
public function assertRaised()
@@ -480,7 +532,9 @@ private function getViolation()
$this->propertyPath,
$this->invalidValue,
$this->plural,
- $this->code
+ $this->code,
+ $this->constraint,
+ $this->cause
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
index 68011e8f5046cff555e10263f95d02218269d1c5..57dd6006974b0191b696499b6aef19809bfe0a28 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
@@ -54,7 +54,7 @@ public function testWalkSingleConstraint($array)
$i = 0;
foreach ($array as $key => $value) {
- $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint), 'MyGroup');
+ $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint));
}
$this->validator->validate($array, new All($constraint));
@@ -75,7 +75,7 @@ public function testWalkMultipleConstraints($array)
$i = 0;
foreach ($array as $key => $value) {
- $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint1, $constraint2), 'MyGroup');
+ $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint1, $constraint2));
}
$this->validator->validate($array, new All($constraints));
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
index 40bba756c21ef2d6b69668bb9363adb9da38c358..aab54e590f0d50972da53ced8a261a6a7c201d9d 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
@@ -54,7 +54,7 @@ public function testValidNumbers($scheme, $number)
/**
* @dataProvider getInvalidNumbers
*/
- public function testInvalidNumbers($scheme, $number)
+ public function testInvalidNumbers($scheme, $number, $code)
{
$constraint = new CardScheme(array(
'schemes' => $scheme,
@@ -65,6 +65,7 @@ public function testInvalidNumbers($scheme, $number)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', is_string($number) ? '"'.$number.'"' : $number)
+ ->setCode($code)
->assertRaised();
}
@@ -113,20 +114,20 @@ public function getValidNumbers()
public function getInvalidNumbers()
{
return array(
- array('VISA', '42424242424242424242'),
- array('AMEX', '357298508610146'),
- array('DINERS', '31569309025904'),
- array('DINERS', '37088894118515'),
- array('INSTAPAYMENT', '6313440808445746'),
- array('CHINA_UNIONPAY', '622888888888888'),
- array('CHINA_UNIONPAY', '62288888888888888888'),
- array('AMEX', '30569309025904'), // DINERS number
- array('AMEX', 'invalid'), // A string
- array('AMEX', 0), // a lone number
- array('AMEX', '0'), // a lone number
- array('AMEX', '000000000000'), // a lone number
- array('DINERS', '3056930'), // only first part of the number
- array('DISCOVER', '1117'), // only last 4 digits
+ array('VISA', '42424242424242424242', CardScheme::INVALID_FORMAT_ERROR),
+ array('AMEX', '357298508610146', CardScheme::INVALID_FORMAT_ERROR),
+ array('DINERS', '31569309025904', CardScheme::INVALID_FORMAT_ERROR),
+ array('DINERS', '37088894118515', CardScheme::INVALID_FORMAT_ERROR),
+ array('INSTAPAYMENT', '6313440808445746', CardScheme::INVALID_FORMAT_ERROR),
+ array('CHINA_UNIONPAY', '622888888888888', CardScheme::INVALID_FORMAT_ERROR),
+ array('CHINA_UNIONPAY', '62288888888888888888', CardScheme::INVALID_FORMAT_ERROR),
+ array('AMEX', '30569309025904', CardScheme::INVALID_FORMAT_ERROR), // DINERS number
+ array('AMEX', 'invalid', CardScheme::NOT_NUMERIC_ERROR), // A string
+ array('AMEX', 0, CardScheme::INVALID_FORMAT_ERROR), // a lone number
+ array('AMEX', '0', CardScheme::INVALID_FORMAT_ERROR), // a lone number
+ array('AMEX', '000000000000', CardScheme::INVALID_FORMAT_ERROR), // a lone number
+ array('DINERS', '3056930', CardScheme::INVALID_FORMAT_ERROR), // only first part of the number
+ array('DISCOVER', '1117', CardScheme::INVALID_FORMAT_ERROR), // only last 4 digits
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
index 84b5bc3b0d63be2a1521ac9030a2ccd34e728ce8..aa5b8945b2eee778e5bda7f5498cb3524ec83c93 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -146,6 +146,7 @@ public function testInvalidChoice()
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"baz"')
+ ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
->assertRaised();
}
@@ -162,6 +163,7 @@ public function testInvalidChoiceMultiple()
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"baz"')
->setInvalidValue('baz')
+ ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
->assertRaised();
}
@@ -184,6 +186,7 @@ public function testTooFewChoices()
->setParameter('{{ limit }}', 2)
->setInvalidValue($value)
->setPlural(2)
+ ->setCode(Choice::TOO_FEW_ERROR)
->assertRaised();
}
@@ -206,6 +209,7 @@ public function testTooManyChoices()
->setParameter('{{ limit }}', 2)
->setInvalidValue($value)
->setPlural(2)
+ ->setCode(Choice::TOO_MANY_ERROR)
->assertRaised();
}
@@ -246,6 +250,7 @@ public function testStrictDisallowsDifferentType()
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"2"')
+ ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
->assertRaised();
}
@@ -276,6 +281,7 @@ public function testStrictWithMultipleChoices()
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"3"')
->setInvalidValue('3')
+ ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
->assertRaised();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
index 93e9af5e8714a2c313070bdf0508ef18a904c62f..0376814341fb810b8564317ef394e5f4243665e7 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
@@ -48,7 +48,7 @@ public function testFieldsAsDefaultOption()
$data = $this->prepareTestData(array('foo' => 'foobar'));
- $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
$this->validator->validate($data, new Collection(array(
'foo' => $constraint,
@@ -79,7 +79,7 @@ public function testWalkSingleConstraint()
$i = 0;
foreach ($array as $key => $value) {
- $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint), 'MyGroup');
+ $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint));
}
$data = $this->prepareTestData($array);
@@ -109,7 +109,7 @@ public function testWalkMultipleConstraints()
$i = 0;
foreach ($array as $key => $value) {
- $this->expectValidateValueAt($i++, '['.$key.']', $value, $constraints, 'MyGroup');
+ $this->expectValidateValueAt($i++, '['.$key.']', $value, $constraints);
}
$data = $this->prepareTestData($array);
@@ -133,7 +133,7 @@ public function testExtraFieldsDisallowed()
'baz' => 6,
));
- $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
$this->validator->validate($data, new Collection(array(
'fields' => array(
@@ -146,6 +146,7 @@ public function testExtraFieldsDisallowed()
->setParameter('{{ field }}', '"baz"')
->atPath('property.path[baz]')
->setInvalidValue(6)
+ ->setCode(Collection::NO_SUCH_FIELD_ERROR)
->assertRaised();
}
@@ -158,7 +159,7 @@ public function testNullNotConsideredExtraField()
$constraint = new Range(array('min' => 4));
- $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
$this->validator->validate($data, new Collection(array(
'fields' => array(
@@ -178,7 +179,7 @@ public function testExtraFieldsAllowed()
$constraint = new Range(array('min' => 4));
- $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
$this->validator->validate($data, new Collection(array(
'fields' => array(
@@ -207,6 +208,7 @@ public function testMissingFieldsDisallowed()
->setParameter('{{ field }}', '"foo"')
->atPath('property.path[foo]')
->setInvalidValue(null)
+ ->setCode(Collection::MISSING_FIELD_ERROR)
->assertRaised();
}
@@ -258,7 +260,7 @@ public function testOptionalFieldSingleConstraint()
$constraint = new Range(array('min' => 4));
- $this->expectValidateValueAt(0, '[foo]', $array['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $array['foo'], array($constraint));
$data = $this->prepareTestData($array);
@@ -280,7 +282,7 @@ public function testOptionalFieldMultipleConstraints()
new Range(array('min' => 4)),
);
- $this->expectValidateValueAt(0, '[foo]', $array['foo'], $constraints, 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $array['foo'], $constraints);
$data = $this->prepareTestData($array);
@@ -319,6 +321,7 @@ public function testRequiredFieldNotPresent()
->setParameter('{{ field }}', '"foo"')
->atPath('property.path[foo]')
->setInvalidValue(null)
+ ->setCode(Collection::MISSING_FIELD_ERROR)
->assertRaised();
}
@@ -330,7 +333,7 @@ public function testRequiredFieldSingleConstraint()
$constraint = new Range(array('min' => 4));
- $this->expectValidateValueAt(0, '[foo]', $array['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $array['foo'], array($constraint));
$data = $this->prepareTestData($array);
@@ -352,7 +355,7 @@ public function testRequiredFieldMultipleConstraints()
new Range(array('min' => 4)),
);
- $this->expectValidateValueAt(0, '[foo]', $array['foo'], $constraints, 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $array['foo'], $constraints);
$data = $this->prepareTestData($array);
@@ -371,7 +374,7 @@ public function testObjectShouldBeLeftUnchanged()
$constraint = new Range(array('min' => 2));
- $this->expectValidateValueAt(0, '[foo]', $value['foo'], array($constraint), 'MyGroup');
+ $this->expectValidateValueAt(0, '[foo]', $value['foo'], array($constraint));
$this->validator->validate($value, new Collection(array(
'fields' => array(
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..21cb4611aa75a5153f147fc1a718068887d8efe2
--- /dev/null
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
@@ -0,0 +1,137 @@
+<?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\Validator\Tests\Constraints;
+
+use Symfony\Component\Validator\Constraints\Composite;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Constraints\Valid;
+
+class ConcreteComposite extends Composite
+{
+ public $constraints;
+
+ protected function getCompositeOption()
+ {
+ return 'constraints';
+ }
+
+ public function getDefaultOption()
+ {
+ return 'constraints';
+ }
+}
+
+/**
+ * @since 2.6
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class CompositeTest extends \PHPUnit_Framework_TestCase
+{
+ public function testMergeNestedGroupsIfNoExplicitParentGroup()
+ {
+ $constraint = new ConcreteComposite(array(
+ new NotNull(array('groups' => 'Default')),
+ new NotBlank(array('groups' => array('Default', 'Strict'))),
+ ));
+
+ $this->assertEquals(array('Default', 'Strict'), $constraint->groups);
+ $this->assertEquals(array('Default'), $constraint->constraints[0]->groups);
+ $this->assertEquals(array('Default', 'Strict'), $constraint->constraints[1]->groups);
+ }
+
+ public function testSetImplicitNestedGroupsIfExplicitParentGroup()
+ {
+ $constraint = new ConcreteComposite(array(
+ 'constraints' => array(
+ new NotNull(),
+ new NotBlank(),
+ ),
+ 'groups' => array('Default', 'Strict'),
+ ));
+
+ $this->assertEquals(array('Default', 'Strict'), $constraint->groups);
+ $this->assertEquals(array('Default', 'Strict'), $constraint->constraints[0]->groups);
+ $this->assertEquals(array('Default', 'Strict'), $constraint->constraints[1]->groups);
+ }
+
+ public function testExplicitNestedGroupsMustBeSubsetOfExplicitParentGroups()
+ {
+ $constraint = new ConcreteComposite(array(
+ 'constraints' => array(
+ new NotNull(array('groups' => 'Default')),
+ new NotBlank(array('groups' => 'Strict')),
+ ),
+ 'groups' => array('Default', 'Strict'),
+ ));
+
+ $this->assertEquals(array('Default', 'Strict'), $constraint->groups);
+ $this->assertEquals(array('Default'), $constraint->constraints[0]->groups);
+ $this->assertEquals(array('Strict'), $constraint->constraints[1]->groups);
+ }
+
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testFailIfExplicitNestedGroupsNotSubsetOfExplicitParentGroups()
+ {
+ new ConcreteComposite(array(
+ 'constraints' => array(
+ new NotNull(array('groups' => array('Default', 'Foobar'))),
+ ),
+ 'groups' => array('Default', 'Strict'),
+ ));
+ }
+
+ public function testImplicitGroupNamesAreForwarded()
+ {
+ $constraint = new ConcreteComposite(array(
+ new NotNull(array('groups' => 'Default')),
+ new NotBlank(array('groups' => 'Strict')),
+ ));
+
+ $constraint->addImplicitGroupName('ImplicitGroup');
+
+ $this->assertEquals(array('Default', 'Strict', 'ImplicitGroup'), $constraint->groups);
+ $this->assertEquals(array('Default', 'ImplicitGroup'), $constraint->constraints[0]->groups);
+ $this->assertEquals(array('Strict'), $constraint->constraints[1]->groups);
+ }
+
+ public function testSingleConstraintsAccepted()
+ {
+ $nestedConstraint = new NotNull();
+ $constraint = new ConcreteComposite($nestedConstraint);
+
+ $this->assertEquals(array($nestedConstraint), $constraint->constraints);
+ }
+
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testFailIfNoConstraint()
+ {
+ new ConcreteComposite(array(
+ new NotNull(array('groups' => 'Default')),
+ 'NotBlank',
+ ));
+ }
+
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testValidCantBeNested()
+ {
+ new ConcreteComposite(array(
+ new Valid(),
+ ));
+ }
+}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
index 31c7c7856288cd910a247308a67d0402d6bff6dd..6713166ce461fa836e41a6727058d3e87128466b 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
@@ -124,6 +124,7 @@ public function testTooManyValues($value)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Count::TOO_MANY_ERROR)
->assertRaised();
}
@@ -144,6 +145,7 @@ public function testTooFewValues($value)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Count::TOO_FEW_ERROR)
->assertRaised();
}
@@ -165,6 +167,7 @@ public function testTooManyValuesExact($value)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Count::TOO_MANY_ERROR)
->assertRaised();
}
@@ -186,6 +189,7 @@ public function testTooFewValuesExact($value)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Count::TOO_FEW_ERROR)
->assertRaised();
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
index 89de5fd9a5153f4d9bb71ff5f49cf7a84b448efe..25d88aa2ab882fb55d19fd94895e3bf45d185152 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
@@ -78,7 +78,7 @@ public function getValidDateTimes()
/**
* @dataProvider getInvalidDateTimes
*/
- public function testInvalidDateTimes($dateTime)
+ public function testInvalidDateTimes($dateTime, $code)
{
$constraint = new DateTime(array(
'message' => 'myMessage',
@@ -88,22 +88,23 @@ public function testInvalidDateTimes($dateTime)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$dateTime.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidDateTimes()
{
return array(
- array('foobar'),
- array('2010-01-01'),
- array('00:00:00'),
- array('2010-01-01 00:00'),
- array('2010-13-01 00:00:00'),
- array('2010-04-32 00:00:00'),
- array('2010-02-29 00:00:00'),
- array('2010-01-01 24:00:00'),
- array('2010-01-01 00:60:00'),
- array('2010-01-01 00:00:60'),
+ array('foobar', DateTime::INVALID_FORMAT_ERROR),
+ array('2010-01-01', DateTime::INVALID_FORMAT_ERROR),
+ array('00:00:00', DateTime::INVALID_FORMAT_ERROR),
+ array('2010-01-01 00:00', DateTime::INVALID_FORMAT_ERROR),
+ array('2010-13-01 00:00:00', DateTime::INVALID_DATE_ERROR),
+ array('2010-04-32 00:00:00', DateTime::INVALID_DATE_ERROR),
+ array('2010-02-29 00:00:00', DateTime::INVALID_DATE_ERROR),
+ array('2010-01-01 24:00:00', DateTime::INVALID_TIME_ERROR),
+ array('2010-01-01 00:60:00', DateTime::INVALID_TIME_ERROR),
+ array('2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR),
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
index 352ded5422a5abaf44fa87009d78ca419fdaac54..21f0a2dcc3d605b491c19265bc5a15f04a05c540 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
@@ -78,7 +78,7 @@ public function getValidDates()
/**
* @dataProvider getInvalidDates
*/
- public function testInvalidDates($date)
+ public function testInvalidDates($date, $code)
{
$constraint = new Date(array(
'message' => 'myMessage',
@@ -88,18 +88,19 @@ public function testInvalidDates($date)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$date.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidDates()
{
return array(
- array('foobar'),
- array('foobar 2010-13-01'),
- array('2010-13-01 foobar'),
- array('2010-13-01'),
- array('2010-04-32'),
- array('2010-02-29'),
+ array('foobar', Date::INVALID_FORMAT_ERROR),
+ array('foobar 2010-13-01', Date::INVALID_FORMAT_ERROR),
+ array('2010-13-01 foobar', Date::INVALID_FORMAT_ERROR),
+ array('2010-13-01', Date::INVALID_DATE_ERROR),
+ array('2010-04-32', Date::INVALID_DATE_ERROR),
+ array('2010-02-29', Date::INVALID_DATE_ERROR),
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
index fb39f8854052ea7c3c06e275bdde49010504f5c4..0361333fdc16a0006288f7f516391dae3c6ad4f8 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -81,6 +81,7 @@ public function testInvalidEmails($email)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$email.'"')
+ ->setCode(Email::INVALID_FORMAT_ERROR)
->assertRaised();
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
index 0fd4a044cb913c2ed857a3cd8d78b2796a358d58..c20db1550ba2772b733b060c060d014b296e1c0c 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
@@ -45,6 +45,8 @@ public function provideValidComparisons()
array(3, '3'),
array('a', 'a'),
array(new \DateTime('2000-01-01'), new \DateTime('2000-01-01')),
+ array(new \DateTime('2000-01-01'), '2000-01-01'),
+ array(new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'),
array(new ComparisonTest_Class(5), new ComparisonTest_Class(5)),
array(null, 1),
);
@@ -59,6 +61,8 @@ public function provideInvalidComparisons()
array(1, '1', 2, '2', 'integer'),
array('22', '"22"', '333', '"333"', 'string'),
array(new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2001-01-01 UTC'), 'Jan 1, 2001, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array(new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
);
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
index 378f531936373e285cf21238c404b58a050856c6..3d4ef75978a6f2f23a78d475c92367f356d06e3b 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
@@ -29,18 +29,32 @@ protected function createValidator()
return new ExpressionValidator(PropertyAccess::createPropertyAccessor());
}
- public function testNullIsValid()
+ public function testExpressionIsEvaluatedWithNullValue()
{
- $this->validator->validate(null, new Expression('value == 1'));
+ $constraint = new Expression(array(
+ 'expression' => 'false',
+ 'message' => 'myMessage',
+ ));
- $this->assertNoViolation();
+ $this->validator->validate(null, $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', 'null')
+ ->assertRaised();
}
- public function testEmptyStringIsValid()
+ public function testExpressionIsEvaluatedWithEmptyStringValue()
{
- $this->validator->validate('', new Expression('value == 1'));
+ $constraint = new Expression(array(
+ 'expression' => 'false',
+ 'message' => 'myMessage',
+ ));
- $this->assertNoViolation();
+ $this->validator->validate('', $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', '""')
+ ->assertRaised();
}
public function testSucceedingExpressionAtObjectLevel()
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ee46813bf8b0bedfcad235852c9ac3b2bc779d8
--- /dev/null
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileTest.php
@@ -0,0 +1,107 @@
+<?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\Validator\Tests\Constraints;
+
+use Symfony\Component\Validator\Constraints\File;
+
+class FileTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @param mixed $maxSize
+ * @param int bytes
+ * @param bool $bytes
+ * @dataProvider provideValidSizes
+ */
+ public function testMaxSize($maxSize, $bytes, $binaryFormat)
+ {
+ $file = new File(array('maxSize' => $maxSize));
+
+ $this->assertSame($bytes, $file->maxSize);
+ $this->assertSame($binaryFormat, $file->binaryFormat);
+ }
+
+ /**
+ * @param mixed $maxSize
+ * @param int $bytes
+ * @dataProvider provideInValidSizes
+ * @expectedException Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testInvalideMaxSize($maxSize)
+ {
+ $file = new File(array('maxSize' => $maxSize));
+ }
+
+ /**
+ * @return array
+ */
+ public function provideValidSizes()
+ {
+ return array(
+ array('500', 500, false),
+ array(12300, 12300, false),
+ array('1ki', 1024, true),
+ array('1KI', 1024, true),
+ array('2k', 2000, false),
+ array('2K', 2000, false),
+ array('1mi', 1048576, true),
+ array('1MI', 1048576, true),
+ array('3m', 3000000, false),
+ array('3M', 3000000, false),
+ );
+ }
+
+ /**
+ * @return array
+ */
+ public function provideInvalidSizes()
+ {
+ return array(
+ array('+100'),
+ array('foo'),
+ array('1Ko'),
+ array('1kio'),
+ array('1G'),
+ array('1Gi'),
+ );
+ }
+
+ /**
+ * @param mixed $maxSize
+ * @param bool $guessedFormat
+ * @param bool $binaryFormat
+ * @dataProvider provideFormats
+ */
+ public function testBinaryFormat($maxSize, $guessedFormat, $binaryFormat)
+ {
+ $file = new File(array('maxSize' => $maxSize, 'binaryFormat' => $guessedFormat));
+
+ $this->assertSame($binaryFormat, $file->binaryFormat);
+ }
+
+ /**
+ * @return array
+ */
+ public function provideFormats()
+ {
+ return array(
+ array(100, null, false),
+ array(100, true, true),
+ array(100, false, false),
+ array('100K', null, false),
+ array('100K', true, true),
+ array('100K', false, false),
+ array('100Ki', null, true),
+ array('100Ki', true, true),
+ array('100Ki', false, false),
+ );
+ }
+}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
index 25def64c19c95d99e82722e832cbe88c69b37912..11b8d4cb7987ce347d25f384c9e2ddf3e7bfd84a 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
@@ -30,6 +30,7 @@ public function testFileNotFound()
$this->buildViolation('myMessage')
->setParameter('{{ file }}', '"foobar"')
+ ->setCode(File::NOT_FOUND_ERROR)
->assertRaised();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index fc39b64be5d96dfce1eb01117e40d026d7f9661c..7169eed030446fb01e069bd3760250bbbfaac2de 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -38,6 +38,7 @@ protected function setUp()
$this->path = sys_get_temp_dir().DIRECTORY_SEPARATOR.'FileValidatorTest';
$this->file = fopen($this->path, 'w');
+ fwrite($this->file, ' ', 1);
}
protected function tearDown()
@@ -98,7 +99,6 @@ public function provideMaxSizeExceededTests()
// We have various interesting limit - size combinations to test.
// Assume a limit of 1000 bytes (1 kB). Then the following table
// lists the violation messages for different file sizes:
-
// -----------+--------------------------------------------------------
// Size | Violation Message
// -----------+--------------------------------------------------------
@@ -143,6 +143,20 @@ public function provideMaxSizeExceededTests()
array(1000001, '1M', '1000001', '1000000', 'bytes'),
array(1004999, '1M', '1005', '1000', 'kB'),
array(1005000, '1M', '1.01', '1', 'MB'),
+
+ // limit in KiB
+ array(1025, '1Ki', '1025', '1024', 'bytes'),
+ array(1029, '1Ki', '1029', '1024', 'bytes'),
+ array(1030, '1Ki', '1.01', '1', 'KiB'),
+
+ array(1048577, '1024Ki', '1048577', '1048576', 'bytes'),
+ array(1053818, '1024Ki', '1029.12', '1024', 'KiB'),
+ array(1053819, '1024Ki', '1.01', '1', 'MiB'),
+
+ // limit in MiB
+ array(1048577, '1Mi', '1048577', '1048576', 'bytes'),
+ array(1053818, '1Mi', '1029.12', '1024', 'KiB'),
+ array(1053819, '1Mi', '1.01', '1', 'MiB'),
);
}
@@ -156,8 +170,8 @@ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limit
fclose($this->file);
$constraint = new File(array(
- 'maxSize' => $limit,
- 'maxSizeMessage' => 'myMessage',
+ 'maxSize' => $limit,
+ 'maxSizeMessage' => 'myMessage',
));
$this->validator->validate($this->getFile($this->path), $constraint);
@@ -167,6 +181,7 @@ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limit
->setParameter('{{ size }}', $sizeAsString)
->setParameter('{{ suffix }}', $suffix)
->setParameter('{{ file }}', '"'.$this->path.'"')
+ ->setCode(File::TOO_LARGE_ERROR)
->assertRaised();
}
@@ -183,6 +198,13 @@ public function provideMaxSizeNotExceededTests()
// limit in MB
array(1000000, '1M'),
+
+ // limit in KiB
+ array(1024, '1Ki'),
+ array(1048576, '1024Ki'),
+
+ // limit in MiB
+ array(1048576, '1Mi'),
);
}
@@ -196,8 +218,8 @@ public function testMaxSizeNotExceeded($bytesWritten, $limit)
fclose($this->file);
$constraint = new File(array(
- 'maxSize' => $limit,
- 'maxSizeMessage' => 'myMessage',
+ 'maxSize' => $limit,
+ 'maxSizeMessage' => 'myMessage',
));
$this->validator->validate($this->getFile($this->path), $constraint);
@@ -217,6 +239,54 @@ public function testInvalidMaxSize()
$this->validator->validate($this->path, $constraint);
}
+ public function provideBinaryFormatTests()
+ {
+ return array(
+ array(11, 10, null, '11', '10', 'bytes'),
+ array(11, 10, true, '11', '10', 'bytes'),
+ array(11, 10, false, '11', '10', 'bytes'),
+
+ // round(size) == 1.01kB, limit == 1kB
+ array(ceil(1000*1.01), 1000, null, '1.01', '1', 'kB'),
+ array(ceil(1000*1.01), '1k', null, '1.01', '1', 'kB'),
+ array(ceil(1024*1.01), '1Ki', null, '1.01', '1', 'KiB'),
+
+ array(ceil(1024*1.01), 1024, true, '1.01', '1', 'KiB'),
+ array(ceil(1024*1.01*1000), '1024k', true, '1010', '1000', 'KiB'),
+ array(ceil(1024*1.01), '1Ki', true, '1.01', '1', 'KiB'),
+
+ array(ceil(1000*1.01), 1000, false, '1.01', '1', 'kB'),
+ array(ceil(1000*1.01), '1k', false, '1.01', '1', 'kB'),
+ array(ceil(1024*1.01*10), '10Ki', false, '10.34', '10.24', 'kB'),
+ );
+ }
+
+ /**
+ * @dataProvider provideBinaryFormatTests
+ */
+ public function testBinaryFormat($bytesWritten, $limit, $binaryFormat, $sizeAsString, $limitAsString, $suffix)
+ {
+ fseek($this->file, $bytesWritten-1, SEEK_SET);
+ fwrite($this->file, '0');
+ fclose($this->file);
+
+ $constraint = new File(array(
+ 'maxSize' => $limit,
+ 'binaryFormat' => $binaryFormat,
+ 'maxSizeMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate($this->getFile($this->path), $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ limit }}', $limitAsString)
+ ->setParameter('{{ size }}', $sizeAsString)
+ ->setParameter('{{ suffix }}', $suffix)
+ ->setParameter('{{ file }}', '"'.$this->path.'"')
+ ->setCode(File::TOO_LARGE_ERROR)
+ ->assertRaised();
+ }
+
public function testValidMimeType()
{
$file = $this
@@ -291,6 +361,7 @@ public function testInvalidMimeType()
->setParameter('{{ type }}', '"application/pdf"')
->setParameter('{{ types }}', '"image/png", "image/jpg"')
->setParameter('{{ file }}', '"'.$this->path.'"')
+ ->setCode(File::INVALID_MIME_TYPE_ERROR)
->assertRaised();
}
@@ -320,6 +391,23 @@ public function testInvalidWildcardMimeType()
->setParameter('{{ type }}', '"application/pdf"')
->setParameter('{{ types }}', '"image/*", "image/jpg"')
->setParameter('{{ file }}', '"'.$this->path.'"')
+ ->setCode(File::INVALID_MIME_TYPE_ERROR)
+ ->assertRaised();
+ }
+
+ public function testDisallowEmpty()
+ {
+ ftruncate($this->file, 0);
+
+ $constraint = new File(array(
+ 'disallowEmptyMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate($this->getFile($this->path), $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ file }}', '"'.$this->path.'"')
+ ->setCode(File::EMPTY_ERROR)
->assertRaised();
}
@@ -339,6 +427,7 @@ public function testUploadedFileError($error, $message, array $params = array(),
$this->buildViolation('myMessage')
->setParameters($params)
+ ->setCode($error)
->assertRaised();
}
@@ -356,8 +445,8 @@ public function uploadedFileErrorProvider()
if (class_exists('Symfony\Component\HttpFoundation\File\UploadedFile')) {
// when no maxSize is specified on constraint, it should use the ini value
$tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
- '{{ limit }}' => UploadedFile::getMaxFilesize(),
- '{{ suffix }}' => 'bytes',
+ '{{ limit }}' => UploadedFile::getMaxFilesize() / 1048576,
+ '{{ suffix }}' => 'MiB',
));
// it should use the smaller limitation (maxSize option in this case)
@@ -369,9 +458,16 @@ public function uploadedFileErrorProvider()
// it correctly parses the maxSize option and not only uses simple string comparison
// 1000M should be bigger than the ini value
$tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
- '{{ limit }}' => UploadedFile::getMaxFilesize(),
- '{{ suffix }}' => 'bytes',
+ '{{ limit }}' => UploadedFile::getMaxFilesize() / 1048576,
+ '{{ suffix }}' => 'MiB',
), '1000M');
+
+ // it correctly parses the maxSize option and not only uses simple string comparison
+ // 1000M should be bigger than the ini value
+ $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
+ '{{ limit }}' => '0.1',
+ '{{ suffix }}' => 'MB',
+ ), '100K');
}
return $tests;
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
index 2c3f1e9f8b85acb3b096b3f10baa6cb9728797e0..41708f65c966ee18c1832d9c364ef639c153c423 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
@@ -45,6 +45,10 @@ public function provideValidComparisons()
array(1, 1),
array(new \DateTime('2010/01/01'), new \DateTime('2000/01/01')),
array(new \DateTime('2000/01/01'), new \DateTime('2000/01/01')),
+ array(new \DateTime('2010/01/01'), '2000/01/01'),
+ array(new \DateTime('2000/01/01'), '2000/01/01'),
+ array(new \DateTime('2010/01/01 UTC'), '2000/01/01 UTC'),
+ array(new \DateTime('2000/01/01 UTC'), '2000/01/01 UTC'),
array('a', 'a'),
array('z', 'a'),
array(null, 1),
@@ -59,6 +63,8 @@ public function provideInvalidComparisons()
return array(
array(1, '1', 2, '2', 'integer'),
array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
array('b', '"b"', 'c', '"c"', 'string'),
);
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
index 6ac25965dfc51c485cc92268658d77b4ac063693..85a2b1dad18d5ec5b0bc7d205988a3211426abff 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
@@ -43,6 +43,8 @@ public function provideValidComparisons()
return array(
array(2, 1),
array(new \DateTime('2005/01/01'), new \DateTime('2001/01/01')),
+ array(new \DateTime('2005/01/01'), '2001/01/01'),
+ array(new \DateTime('2005/01/01 UTC'), '2001/01/01 UTC'),
array(new ComparisonTest_Class(5), new ComparisonTest_Class(4)),
array('333', '22'),
array(null, 1),
@@ -59,6 +61,10 @@ public function provideInvalidComparisons()
array(2, '2', 2, '2', 'integer'),
array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'),
array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2000/01/01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000/01/01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array(new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
array('22', '"22"', '333', '"333"', 'string'),
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
index d2ecf8f51b80cd1c476dabe04f0a573992f3aa4d..ab9839a2389682bc7a0154c5883c37c90afd89c0 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
@@ -156,7 +156,7 @@ public function getValidIbans()
/**
* @dataProvider getInvalidIbans
*/
- public function testInvalidIbans($iban)
+ public function testInvalidIbans($iban, $code)
{
$constraint = new Iban(array(
'message' => 'myMessage',
@@ -166,27 +166,28 @@ public function testInvalidIbans($iban)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$iban.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidIbans()
{
return array(
- array('CH93 0076 2011 6238 5295'),
- array('CH930076201162385295'),
- array('GB29 RBOS 6016 1331 9268 19'),
- array('CH930072011623852957'),
- array('NL39 RASO 0300 0652 64'),
- array('NO93 8601117 947'),
- array('CY170020 128 0000 0012 0052 7600'),
- array('foo'),
- array('123'),
- array('0750447346'),
- array('CH930076201162385295]'),
+ array('CH93 0076 2011 6238 5295', Iban::CHECKSUM_FAILED_ERROR),
+ array('CH930076201162385295', Iban::CHECKSUM_FAILED_ERROR),
+ array('GB29 RBOS 6016 1331 9268 19', Iban::CHECKSUM_FAILED_ERROR),
+ array('CH930072011623852957', Iban::CHECKSUM_FAILED_ERROR),
+ array('NL39 RASO 0300 0652 64', Iban::CHECKSUM_FAILED_ERROR),
+ array('NO93 8601117 947', Iban::CHECKSUM_FAILED_ERROR),
+ array('CY170020 128 0000 0012 0052 7600', Iban::CHECKSUM_FAILED_ERROR),
+ array('foo', Iban::TOO_SHORT_ERROR),
+ array('123', Iban::TOO_SHORT_ERROR),
+ array('0750447346', Iban::INVALID_COUNTRY_CODE_ERROR),
+ array('CH930076201162385295]', Iban::INVALID_CHARACTERS_ERROR),
//Ibans with lower case values are invalid
- array('Ae260211000000230064016'),
- array('ae260211000000230064016'),
+ array('Ae260211000000230064016', Iban::INVALID_CASE_ERROR),
+ array('ae260211000000230064016', Iban::INVALID_CASE_ERROR),
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
index 125a2844384efa3455d25d7248b392d34d79afdc..4b71062f059354b08c8e37cacfcfbf7839a753ee 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
@@ -35,6 +35,19 @@ protected function createConstraint(array $options)
return new IdenticalTo($options);
}
+ public function provideAllValidComparisons()
+ {
+ $this->setDefaultTimezone('UTC');
+
+ // Don't call addPhp5Dot5Comparisons() automatically, as it does
+ // not take care of identical objects
+ $comparisons = $this->provideValidComparisons();
+
+ $this->restoreDefaultTimezone();
+
+ return $comparisons;
+ }
+
/**
* {@inheritdoc}
*/
@@ -43,13 +56,20 @@ public function provideValidComparisons()
$date = new \DateTime('2000-01-01');
$object = new ComparisonTest_Class(2);
- return array(
+ $comparisons = array(
array(3, 3),
array('a', 'a'),
array($date, $date),
array($object, $object),
array(null, 1),
);
+
+ if (version_compare(PHP_VERSION, '>=', '5.5')) {
+ $immutableDate = new \DateTimeImmutable('2000-01-01');
+ $comparisons[] = array($immutableDate, $immutableDate);
+ }
+
+ return $comparisons;
}
/**
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
index 5d6c9a91ff4dc97f00184c1283a1c260ca5a0844..18f9c1bc0673db3864d13171b9a630cfcdc5d7c9 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -71,6 +71,21 @@ public function testValidImage()
$this->assertNoViolation();
}
+ public function testFileNotFound()
+ {
+ // Check that the logic from FileValidator still works
+ $constraint = new Image(array(
+ 'notFoundMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate('foobar', $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ file }}', '"foobar"')
+ ->setCode(Image::NOT_FOUND_ERROR)
+ ->assertRaised();
+ }
+
public function testValidSize()
{
$constraint = new Image(array(
@@ -97,6 +112,7 @@ public function testWidthTooSmall()
$this->buildViolation('myMessage')
->setParameter('{{ width }}', '2')
->setParameter('{{ min_width }}', '3')
+ ->setCode(Image::TOO_NARROW_ERROR)
->assertRaised();
}
@@ -112,6 +128,7 @@ public function testWidthTooBig()
$this->buildViolation('myMessage')
->setParameter('{{ width }}', '2')
->setParameter('{{ max_width }}', '1')
+ ->setCode(Image::TOO_WIDE_ERROR)
->assertRaised();
}
@@ -127,6 +144,7 @@ public function testHeightTooSmall()
$this->buildViolation('myMessage')
->setParameter('{{ height }}', '2')
->setParameter('{{ min_height }}', '3')
+ ->setCode(Image::TOO_LOW_ERROR)
->assertRaised();
}
@@ -142,6 +160,7 @@ public function testHeightTooBig()
$this->buildViolation('myMessage')
->setParameter('{{ height }}', '2')
->setParameter('{{ max_height }}', '1')
+ ->setCode(Image::TOO_HIGH_ERROR)
->assertRaised();
}
@@ -205,6 +224,7 @@ public function testRatioTooSmall()
$this->buildViolation('myMessage')
->setParameter('{{ ratio }}', 1)
->setParameter('{{ min_ratio }}', 2)
+ ->setCode(Image::RATIO_TOO_SMALL_ERROR)
->assertRaised();
}
@@ -220,6 +240,7 @@ public function testRatioTooBig()
$this->buildViolation('myMessage')
->setParameter('{{ ratio }}', 1)
->setParameter('{{ max_ratio }}', 0.5)
+ ->setCode(Image::RATIO_TOO_BIG_ERROR)
->assertRaised();
}
@@ -270,6 +291,7 @@ public function testSquareNotAllowed()
$this->buildViolation('myMessage')
->setParameter('{{ width }}', 2)
->setParameter('{{ height }}', 2)
+ ->setCode(Image::SQUARE_NOT_ALLOWED_ERROR)
->assertRaised();
}
@@ -285,6 +307,7 @@ public function testLandscapeNotAllowed()
$this->buildViolation('myMessage')
->setParameter('{{ width }}', 2)
->setParameter('{{ height }}', 1)
+ ->setCode(Image::LANDSCAPE_NOT_ALLOWED_ERROR)
->assertRaised();
}
@@ -300,6 +323,7 @@ public function testPortraitNotAllowed()
$this->buildViolation('myMessage')
->setParameter('{{ width }}', 1)
->setParameter('{{ height }}', 2)
+ ->setCode(Image::PORTRAIT_NOT_ALLOWED_ERROR)
->assertRaised();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
index 296ab7c94a3ab9d2f504cdbd69e891b4a7fc28c0..e73b89d60bab1241e3a21bc8bc7b6635dfa75ad0 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
@@ -52,20 +52,20 @@ public function getValidIsbn10()
public function getInvalidIsbn10()
{
return array(
- array('27234422841'),
- array('272344228'),
- array('0-4712-9231'),
- array('1234567890'),
- array('0987656789'),
- array('7-35622-5444'),
- array('0-4X19-92611'),
- array('0_45122_5244'),
- array('2870#971#648'),
- array('0-9752298-0-x'),
- array('1A34567890'),
+ array('27234422841', Isbn::TOO_LONG_ERROR),
+ array('272344228', Isbn::TOO_SHORT_ERROR),
+ array('0-4712-9231', Isbn::TOO_SHORT_ERROR),
+ array('1234567890', Isbn::CHECKSUM_FAILED_ERROR),
+ array('0987656789', Isbn::CHECKSUM_FAILED_ERROR),
+ array('7-35622-5444', Isbn::CHECKSUM_FAILED_ERROR),
+ array('0-4X19-92611', Isbn::CHECKSUM_FAILED_ERROR),
+ array('0_45122_5244', Isbn::INVALID_CHARACTERS_ERROR),
+ array('2870#971#648', Isbn::INVALID_CHARACTERS_ERROR),
+ array('0-9752298-0-x', Isbn::INVALID_CHARACTERS_ERROR),
+ array('1A34567890', Isbn::INVALID_CHARACTERS_ERROR),
// chr(1) evaluates to 0
// 2070546810 is valid
- array('2'.chr(1).'70546810'),
+ array('2'.chr(1).'70546810', Isbn::INVALID_CHARACTERS_ERROR),
);
}
@@ -90,20 +90,20 @@ public function getValidIsbn13()
public function getInvalidIsbn13()
{
return array(
- array('978-27234422821'),
- array('978-272344228'),
- array('978-2723442-82'),
- array('978-2723442281'),
- array('978-0321513774'),
- array('979-0431225385'),
- array('980-0474292319'),
- array('0-4X19-92619812'),
- array('978_2723442282'),
- array('978#2723442282'),
- array('978-272C442282'),
+ array('978-27234422821', Isbn::TOO_LONG_ERROR),
+ array('978-272344228', Isbn::TOO_SHORT_ERROR),
+ array('978-2723442-82', Isbn::TOO_SHORT_ERROR),
+ array('978-2723442281', Isbn::CHECKSUM_FAILED_ERROR),
+ array('978-0321513774', Isbn::CHECKSUM_FAILED_ERROR),
+ array('979-0431225385', Isbn::CHECKSUM_FAILED_ERROR),
+ array('980-0474292319', Isbn::CHECKSUM_FAILED_ERROR),
+ array('0-4X19-92619812', Isbn::INVALID_CHARACTERS_ERROR),
+ array('978_2723442282', Isbn::INVALID_CHARACTERS_ERROR),
+ array('978#2723442282', Isbn::INVALID_CHARACTERS_ERROR),
+ array('978-272C442282', Isbn::INVALID_CHARACTERS_ERROR),
// chr(1) evaluates to 0
// 978-2070546817 is valid
- array('978-2'.chr(1).'70546817'),
+ array('978-2'.chr(1).'70546817', Isbn::INVALID_CHARACTERS_ERROR),
);
}
@@ -168,7 +168,7 @@ public function testValidIsbn10($isbn)
/**
* @dataProvider getInvalidIsbn10
*/
- public function testInvalidIsbn10($isbn)
+ public function testInvalidIsbn10($isbn, $code)
{
$constraint = new Isbn(array(
'type' => 'isbn10',
@@ -179,6 +179,7 @@ public function testInvalidIsbn10($isbn)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$isbn.'"')
+ ->setCode($code)
->assertRaised();
}
@@ -197,7 +198,7 @@ public function testValidIsbn13($isbn)
/**
* @dataProvider getInvalidIsbn13
*/
- public function testInvalidIsbn13($isbn)
+ public function testInvalidIsbn13($isbn, $code)
{
$constraint = new Isbn(array(
'type' => 'isbn13',
@@ -208,6 +209,7 @@ public function testInvalidIsbn13($isbn)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$isbn.'"')
+ ->setCode($code)
->assertRaised();
}
@@ -226,7 +228,7 @@ public function testValidIsbnAny($isbn)
/**
* @dataProvider getInvalidIsbn10
*/
- public function testInvalidIsbnAnyIsbn10($isbn)
+ public function testInvalidIsbnAnyIsbn10($isbn, $code)
{
$constraint = new Isbn(array(
'bothIsbnMessage' => 'myMessage',
@@ -234,15 +236,21 @@ public function testInvalidIsbnAnyIsbn10($isbn)
$this->validator->validate($isbn, $constraint);
+ // Too long for an ISBN-10, but not long enough for an ISBN-13
+ if (Isbn::TOO_LONG_ERROR === $code) {
+ $code = Isbn::TYPE_NOT_RECOGNIZED_ERROR;
+ }
+
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$isbn.'"')
+ ->setCode($code)
->assertRaised();
}
/**
* @dataProvider getInvalidIsbn13
*/
- public function testInvalidIsbnAnyIsbn13($isbn)
+ public function testInvalidIsbnAnyIsbn13($isbn, $code)
{
$constraint = new Isbn(array(
'bothIsbnMessage' => 'myMessage',
@@ -250,8 +258,14 @@ public function testInvalidIsbnAnyIsbn13($isbn)
$this->validator->validate($isbn, $constraint);
+ // Too short for an ISBN-13, but not short enough for an ISBN-10
+ if (Isbn::TOO_SHORT_ERROR === $code) {
+ $code = Isbn::TYPE_NOT_RECOGNIZED_ERROR;
+ }
+
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$isbn.'"')
+ ->setCode($code)
->assertRaised();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
index cb7ae3d8925dce8fb0e58112f3944487205c74af..a6d39944b0ac1eb078202ba3cc3baad59233151a 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
@@ -82,14 +82,14 @@ public function getValidIssn()
public function getInvalidIssn()
{
return array(
- array(0),
- array('1539'),
- array('2156-537A'),
- array('1119-0231'),
- array('1684-5312'),
- array('1996-0783'),
- array('1684-537X'),
- array('1996-0795'),
+ array(0, Issn::TOO_SHORT_ERROR),
+ array('1539', Issn::TOO_SHORT_ERROR),
+ array('2156-537A', Issn::INVALID_CHARACTERS_ERROR),
+ array('1119-0231', Issn::CHECKSUM_FAILED_ERROR),
+ array('1684-5312', Issn::CHECKSUM_FAILED_ERROR),
+ array('1996-0783', Issn::CHECKSUM_FAILED_ERROR),
+ array('1684-537X', Issn::CHECKSUM_FAILED_ERROR),
+ array('1996-0795', Issn::CHECKSUM_FAILED_ERROR),
);
}
@@ -134,6 +134,7 @@ public function testCaseSensitiveIssns($issn)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$issn.'"')
+ ->setCode(Issn::INVALID_CASE_ERROR)
->assertRaised();
}
@@ -151,6 +152,7 @@ public function testRequireHyphenIssns($issn)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$issn.'"')
+ ->setCode(Issn::MISSING_HYPHEN_ERROR)
->assertRaised();
}
@@ -169,7 +171,7 @@ public function testValidIssn($issn)
/**
* @dataProvider getInvalidIssn
*/
- public function testInvalidIssn($issn)
+ public function testInvalidIssn($issn, $code)
{
$constraint = new Issn(array(
'message' => 'myMessage',
@@ -179,6 +181,7 @@ public function testInvalidIssn($issn)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$issn.'"')
+ ->setCode($code)
->assertRaised();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
index 7674ae24272e32c53cf198cf5d64cb2bdddfdea5..ae27ff25cb452dfbfb48fd530f7e552a530851e1 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -153,6 +153,7 @@ public function testInvalidValuesMin($value, $mbOnly = false)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Length::TOO_SHORT_ERROR)
->assertRaised();
}
@@ -177,6 +178,7 @@ public function testInvalidValuesMax($value, $mbOnly = false)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Length::TOO_LONG_ERROR)
->assertRaised();
}
@@ -202,6 +204,7 @@ public function testInvalidValuesExactLessThanFour($value, $mbOnly = false)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Length::TOO_SHORT_ERROR)
->assertRaised();
}
@@ -227,6 +230,7 @@ public function testInvalidValuesExactMoreThanFour($value, $mbOnly = false)
->setParameter('{{ limit }}', 4)
->setInvalidValue($value)
->setPlural(4)
+ ->setCode(Length::TOO_LONG_ERROR)
->assertRaised();
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
index 4b50259a88a9c8f7747c2d976e29cc37ba119dd4..75181355109ffb43f2b9001929216dcdd036626a 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
@@ -45,6 +45,10 @@ public function provideValidComparisons()
array(1, 1),
array(new \DateTime('2000-01-01'), new \DateTime('2000-01-01')),
array(new \DateTime('2000-01-01'), new \DateTime('2020-01-01')),
+ array(new \DateTime('2000-01-01'), '2000-01-01'),
+ array(new \DateTime('2000-01-01'), '2020-01-01'),
+ array(new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'),
+ array(new \DateTime('2000-01-01 UTC'), '2020-01-01 UTC'),
array(new ComparisonTest_Class(4), new ComparisonTest_Class(5)),
array(new ComparisonTest_Class(5), new ComparisonTest_Class(5)),
array('a', 'a'),
@@ -61,6 +65,8 @@ public function provideInvalidComparisons()
return array(
array(2, '2', 1, '1', 'integer'),
array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(4), '4', __NAMESPACE__.'\ComparisonTest_Class'),
array('c', '"c"', 'b', '"b"', 'string'),
);
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
index eb534e58ba1638f53ce5d7ded6f1b91faa70c059..d555870c120b183d771250f47457efb91df06489 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
@@ -43,6 +43,8 @@ public function provideValidComparisons()
return array(
array(1, 2),
array(new \DateTime('2000-01-01'), new \DateTime('2010-01-01')),
+ array(new \DateTime('2000-01-01'), '2010-01-01'),
+ array(new \DateTime('2000-01-01 UTC'), '2010-01-01 UTC'),
array(new ComparisonTest_Class(4), new ComparisonTest_Class(5)),
array('22', '333'),
array(null, 1),
@@ -59,6 +61,10 @@ public function provideInvalidComparisons()
array(2, '2', 2, '2', 'integer'),
array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
array(new ComparisonTest_Class(6), '6', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
array('333', '"333"', '22', '"22"', 'string'),
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
index 4ad3c736eb09dad7f5aa32895048ca6b6a22e76e..b0e88c3456b082fe0f7ef73a6cefaa7e1224f07f 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
@@ -78,7 +78,7 @@ public function getValidNumbers()
/**
* @dataProvider getInvalidNumbers
*/
- public function testInvalidNumbers($number)
+ public function testInvalidNumbers($number, $code)
{
$constraint = new Luhn(array(
'message' => 'myMessage',
@@ -88,17 +88,18 @@ public function testInvalidNumbers($number)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$number.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidNumbers()
{
return array(
- array('1234567812345678'),
- array('4222222222222222'),
- array('0000000000000000'),
- array('000000!000000000'),
- array('42-22222222222222'),
+ array('1234567812345678', Luhn::CHECKSUM_FAILED_ERROR),
+ array('4222222222222222', Luhn::CHECKSUM_FAILED_ERROR),
+ array('0000000000000000', Luhn::CHECKSUM_FAILED_ERROR),
+ array('000000!000000000', Luhn::INVALID_CHARACTERS_ERROR),
+ array('42-22222222222222', Luhn::INVALID_CHARACTERS_ERROR),
);
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
index 836d01848ace000a6e03da4ab46a4fd92394125b..bc2c348efade0977bb7b684008961df03a3e2561 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
@@ -44,6 +44,8 @@ public function provideValidComparisons()
array(1, 2),
array('22', '333'),
array(new \DateTime('2001-01-01'), new \DateTime('2000-01-01')),
+ array(new \DateTime('2001-01-01'), '2000-01-01'),
+ array(new \DateTime('2001-01-01 UTC'), '2000-01-01 UTC'),
array(new ComparisonTest_Class(6), new ComparisonTest_Class(5)),
array(null, 1),
);
@@ -59,6 +61,8 @@ public function provideInvalidComparisons()
array('2', '"2"', 2, '2', 'integer'),
array('a', '"a"', 'a', '"a"', 'string'),
array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
+ array(new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
);
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
index de676d43707e77b5794e9894884d899bf761a81c..1fbd80663fadda0a575e1c33aba9f96ce6bc6388 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
@@ -46,10 +46,27 @@ public function provideValidComparisons()
array('22', '333'),
array(new \DateTime('2001-01-01'), new \DateTime('2000-01-01')),
array(new \DateTime('2000-01-01'), new \DateTime('2000-01-01')),
+ array(new \DateTime('2001-01-01'), '2000-01-01'),
+ array(new \DateTime('2000-01-01'), '2000-01-01'),
+ array(new \DateTime('2001-01-01'), '2000-01-01'),
+ array(new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'),
array(null, 1),
);
}
+ public function provideAllInvalidComparisons()
+ {
+ $this->setDefaultTimezone('UTC');
+
+ // Don't call addPhp5Dot5Comparisons() automatically, as it does
+ // not take care of identical objects
+ $comparisons = $this->provideInvalidComparisons();
+
+ $this->restoreDefaultTimezone();
+
+ return $comparisons;
+ }
+
/**
* {@inheritdoc}
*/
@@ -58,11 +75,18 @@ public function provideInvalidComparisons()
$date = new \DateTime('2000-01-01');
$object = new ComparisonTest_Class(2);
- return array(
+ $comparisons = array(
array(3, '3', 3, '3', 'integer'),
array('a', '"a"', 'a', '"a"', 'string'),
array($date, 'Jan 1, 2000, 12:00 AM', $date, 'Jan 1, 2000, 12:00 AM', 'DateTime'),
array($object, '2', $object, '2', __NAMESPACE__.'\ComparisonTest_Class'),
);
+
+ if (version_compare(PHP_VERSION, '>=', '5.5')) {
+ $immutableDate = new \DateTimeImmutable('2000-01-01');
+ $comparisons[] = array($immutableDate, 'Jan 1, 2000, 12:00 AM', $immutableDate, 'Jan 1, 2000, 12:00 AM', 'DateTime');
+ }
+
+ return $comparisons;
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
index 81f3ce624dfb221aab5331435b3cc7955bf81043..3bfb405e0720048ac3756de0780112931d6111a9 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Component\Intl\Util\IntlTestHelper;
use Symfony\Component\Validator\Constraints\Range;
use Symfony\Component\Validator\Constraints\RangeValidator;
use Symfony\Component\Validator\Validation;
@@ -116,6 +117,7 @@ public function testInvalidValuesMin($value)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', $value)
->setParameter('{{ limit }}', 10)
+ ->setCode(Range::BELOW_RANGE_ERROR)
->assertRaised();
}
@@ -134,6 +136,7 @@ public function testInvalidValuesMax($value)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', $value)
->setParameter('{{ limit }}', 20)
+ ->setCode(Range::BEYOND_RANGE_ERROR)
->assertRaised();
}
@@ -154,6 +157,7 @@ public function testInvalidValuesCombinedMax($value)
$this->buildViolation('myMaxMessage')
->setParameter('{{ value }}', $value)
->setParameter('{{ limit }}', 20)
+ ->setCode(Range::BEYOND_RANGE_ERROR)
->assertRaised();
}
@@ -174,6 +178,201 @@ public function testInvalidValuesCombinedMin($value)
$this->buildViolation('myMinMessage')
->setParameter('{{ value }}', $value)
->setParameter('{{ limit }}', 10)
+ ->setCode(Range::BELOW_RANGE_ERROR)
+ ->assertRaised();
+ }
+
+ public function getTenthToTwentiethMarch2014()
+ {
+ // The provider runs before setUp(), so we need to manually fix
+ // the default timezone
+ $this->setDefaultTimezone('UTC');
+
+ $tests = array(
+ array(new \DateTime('March 10, 2014')),
+ array(new \DateTime('March 15, 2014')),
+ array(new \DateTime('March 20, 2014')),
+ );
+
+ if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+ $tests[] = array(new \DateTimeImmutable('March 10, 2014'));
+ $tests[] = array(new \DateTimeImmutable('March 15, 2014'));
+ $tests[] = array(new \DateTimeImmutable('March 20, 2014'));
+ }
+
+ $this->restoreDefaultTimezone();
+
+ return $tests;
+ }
+
+ public function getSoonerThanTenthMarch2014()
+ {
+ // The provider runs before setUp(), so we need to manually fix
+ // the default timezone
+ $this->setDefaultTimezone('UTC');
+
+ $tests = array(
+ array(new \DateTime('March 20, 2013')),
+ array(new \DateTime('March 9, 2014')),
+ );
+
+ if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+ $tests[] = array(new \DateTimeImmutable('March 20, 2013'));
+ $tests[] = array(new \DateTimeImmutable('March 9, 2014'));
+ }
+
+ $this->restoreDefaultTimezone();
+
+ return $tests;
+ }
+
+ public function getLaterThanTwentiethMarch2014()
+ {
+ // The provider runs before setUp(), so we need to manually fix
+ // the default timezone
+ $this->setDefaultTimezone('UTC');
+
+ $tests = array(
+ array(new \DateTime('March 21, 2014')),
+ array(new \DateTime('March 9, 2015')),
+ );
+
+ if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+ $tests[] = array(new \DateTimeImmutable('March 21, 2014'));
+ $tests[] = array(new \DateTimeImmutable('March 9, 2015'));
+ }
+
+ $this->restoreDefaultTimezone();
+
+ return $tests;
+ }
+
+ /**
+ * @dataProvider getTenthToTwentiethMarch2014
+ */
+ public function testValidDatesMin($value)
+ {
+ $constraint = new Range(array('min' => 'March 10, 2014'));
+ $this->validator->validate($value, $constraint);
+
+ $this->assertNoViolation();
+ }
+
+ /**
+ * @dataProvider getTenthToTwentiethMarch2014
+ */
+ public function testValidDatesMax($value)
+ {
+ $constraint = new Range(array('max' => 'March 20, 2014'));
+ $this->validator->validate($value, $constraint);
+
+ $this->assertNoViolation();
+ }
+
+ /**
+ * @dataProvider getTenthToTwentiethMarch2014
+ */
+ public function testValidDatesMinMax($value)
+ {
+ $constraint = new Range(array('min' => 'March 10, 2014', 'max' => 'March 20, 2014'));
+ $this->validator->validate($value, $constraint);
+
+ $this->assertNoViolation();
+ }
+
+ /**
+ * @dataProvider getSoonerThanTenthMarch2014
+ */
+ public function testInvalidDatesMin($value)
+ {
+ // Conversion of dates to string differs between ICU versions
+ // Make sure we have the correct version loaded
+ IntlTestHelper::requireIntl($this);
+
+ $constraint = new Range(array(
+ 'min' => 'March 10, 2014',
+ 'minMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate($value, $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', $value)
+ ->setParameter('{{ limit }}', 'Mar 10, 2014, 12:00 AM')
+ ->setCode(Range::BELOW_RANGE_ERROR)
+ ->assertRaised();
+ }
+
+ /**
+ * @dataProvider getLaterThanTwentiethMarch2014
+ */
+ public function testInvalidDatesMax($value)
+ {
+ // Conversion of dates to string differs between ICU versions
+ // Make sure we have the correct version loaded
+ IntlTestHelper::requireIntl($this);
+
+ $constraint = new Range(array(
+ 'max' => 'March 20, 2014',
+ 'maxMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate($value, $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', $value)
+ ->setParameter('{{ limit }}', 'Mar 20, 2014, 12:00 AM')
+ ->setCode(Range::BEYOND_RANGE_ERROR)
+ ->assertRaised();
+ }
+
+ /**
+ * @dataProvider getLaterThanTwentiethMarch2014
+ */
+ public function testInvalidDatesCombinedMax($value)
+ {
+ // Conversion of dates to string differs between ICU versions
+ // Make sure we have the correct version loaded
+ IntlTestHelper::requireIntl($this);
+
+ $constraint = new Range(array(
+ 'min' => 'March 10, 2014',
+ 'max' => 'March 20, 2014',
+ 'minMessage' => 'myMinMessage',
+ 'maxMessage' => 'myMaxMessage',
+ ));
+
+ $this->validator->validate($value, $constraint);
+
+ $this->buildViolation('myMaxMessage')
+ ->setParameter('{{ value }}', $value)
+ ->setParameter('{{ limit }}', 'Mar 20, 2014, 12:00 AM')
+ ->setCode(Range::BEYOND_RANGE_ERROR)
+ ->assertRaised();
+ }
+
+ /**
+ * @dataProvider getSoonerThanTenthMarch2014
+ */
+ public function testInvalidDatesCombinedMin($value)
+ {
+ // Conversion of dates to string differs between ICU versions
+ // Make sure we have the correct version loaded
+ IntlTestHelper::requireIntl($this);
+
+ $constraint = new Range(array(
+ 'min' => 'March 10, 2014',
+ 'max' => 'March 20, 2014',
+ 'minMessage' => 'myMinMessage',
+ 'maxMessage' => 'myMaxMessage',
+ ));
+
+ $this->validator->validate($value, $constraint);
+
+ $this->buildViolation('myMinMessage')
+ ->setParameter('{{ value }}', $value)
+ ->setParameter('{{ limit }}', 'Mar 10, 2014, 12:00 AM')
+ ->setCode(Range::BELOW_RANGE_ERROR)
->assertRaised();
}
@@ -198,6 +397,7 @@ public function testNonNumeric()
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"abcd"')
+ ->setCode(Range::INVALID_VALUE_ERROR)
->assertRaised();
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea37bb4d6bd48c14e1f2a909c06bd382ab34d6a9
--- /dev/null
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
@@ -0,0 +1,87 @@
+<?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 Constraints;
+
+use Symfony\Component\Validator\Constraints\Regex;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class RegexTest extends \PHPUnit_Framework_TestCase
+{
+ public function testConstraintGetDefaultOption()
+ {
+ $constraint = new Regex('/^[0-9]+$/');
+
+ $this->assertSame('/^[0-9]+$/', $constraint->pattern);
+ }
+
+ public function provideHtmlPatterns()
+ {
+ return array(
+ // HTML5 wraps the pattern in ^(?:pattern)$
+ array('/^[0-9]+$/', '[0-9]+'),
+ array('/[0-9]+$/', '.*[0-9]+'),
+ array('/^[0-9]+/', '[0-9]+.*'),
+ array('/[0-9]+/', '.*[0-9]+.*'),
+ // We need a smart way to allow matching of patterns that contain
+ // ^ and $ at various sub-clauses of an or-clause
+ // .*(pattern).* seems to work correctly
+ array('/[0-9]$|[a-z]+/', '.*([0-9]$|[a-z]+).*'),
+ array('/[0-9]$|^[a-z]+/', '.*([0-9]$|^[a-z]+).*'),
+ array('/^[0-9]|[a-z]+$/', '.*(^[0-9]|[a-z]+$).*'),
+ // Unescape escaped delimiters
+ array('/^[0-9]+\/$/', '[0-9]+/'),
+ array('#^[0-9]+\#$#', '[0-9]+#'),
+ // Cannot be converted
+ array('/^[0-9]+$/i', null),
+
+ // Inverse matches are simple, just wrap in
+ // ((?!pattern).)*
+ array('/^[0-9]+$/', '((?!^[0-9]+$).)*', false),
+ array('/[0-9]+$/', '((?![0-9]+$).)*', false),
+ array('/^[0-9]+/', '((?!^[0-9]+).)*', false),
+ array('/[0-9]+/', '((?![0-9]+).)*', false),
+ array('/[0-9]$|[a-z]+/', '((?![0-9]$|[a-z]+).)*', false),
+ array('/[0-9]$|^[a-z]+/', '((?![0-9]$|^[a-z]+).)*', false),
+ array('/^[0-9]|[a-z]+$/', '((?!^[0-9]|[a-z]+$).)*', false),
+ array('/^[0-9]+\/$/', '((?!^[0-9]+/$).)*', false),
+ array('#^[0-9]+\#$#', '((?!^[0-9]+#$).)*', false),
+ array('/^[0-9]+$/i', null, false),
+ );
+ }
+
+ /**
+ * @dataProvider provideHtmlPatterns
+ */
+ public function testGetHtmlPattern($pattern, $htmlPattern, $match = true)
+ {
+ $constraint = new Regex(array(
+ 'pattern' => $pattern,
+ 'match' => $match,
+ ));
+
+ $this->assertSame($pattern, $constraint->pattern);
+ $this->assertSame($htmlPattern, $constraint->getHtmlPattern());
+ }
+
+ public function testGetCustomHtmlPattern()
+ {
+ $constraint = new Regex(array(
+ 'pattern' => '((?![0-9]$|[a-z]+).)*',
+ 'htmlPattern' => 'foobar',
+ ));
+
+ $this->assertSame('((?![0-9]$|[a-z]+).)*', $constraint->pattern);
+ $this->assertSame('foobar', $constraint->getHtmlPattern());
+ }
+}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
index 88e565c01321b487e2a982b9f2ec6cf582a05f72..61917e355cdda455019786d178fedae4f76ff4b9 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
@@ -94,70 +94,4 @@ public function getInvalidValues()
array('090foo'),
);
}
-
- public function testConstraintGetDefaultOption()
- {
- $constraint = new Regex(array(
- 'pattern' => '/^[0-9]+$/',
- ));
-
- $this->assertEquals('pattern', $constraint->getDefaultOption());
- }
-
- public function testHtmlPatternEscaping()
- {
- $constraint = new Regex(array(
- 'pattern' => '/^[0-9]+\/$/',
- ));
-
- $this->assertEquals('[0-9]+/', $constraint->getHtmlPattern());
-
- $constraint = new Regex(array(
- 'pattern' => '#^[0-9]+\#$#',
- ));
-
- $this->assertEquals('[0-9]+#', $constraint->getHtmlPattern());
- }
-
- public function testHtmlPattern()
- {
- // Specified htmlPattern
- $constraint = new Regex(array(
- 'pattern' => '/^[a-z]+$/i',
- 'htmlPattern' => '[a-zA-Z]+',
- ));
- $this->assertEquals('[a-zA-Z]+', $constraint->getHtmlPattern());
-
- // Disabled htmlPattern
- $constraint = new Regex(array(
- 'pattern' => '/^[a-z]+$/i',
- 'htmlPattern' => false,
- ));
- $this->assertNull($constraint->getHtmlPattern());
-
- // Cannot be converted
- $constraint = new Regex(array(
- 'pattern' => '/^[a-z]+$/i',
- ));
- $this->assertNull($constraint->getHtmlPattern());
-
- // Automatically converted
- $constraint = new Regex(array(
- 'pattern' => '/^[a-z]+$/',
- ));
- $this->assertEquals('[a-z]+', $constraint->getHtmlPattern());
-
- // Automatically converted, adds .*
- $constraint = new Regex(array(
- 'pattern' => '/[a-z]+/',
- ));
- $this->assertEquals('.*[a-z]+.*', $constraint->getHtmlPattern());
-
- // Dropped because of match=false
- $constraint = new Regex(array(
- 'pattern' => '/[a-z]+/',
- 'match' => false,
- ));
- $this->assertNull($constraint->getHtmlPattern());
- }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
index 23aed04c0f33156455463aa394862e90aa4cfe3a..a6ca1435ed3385da8002a9b736c148965a75dfc6 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
@@ -78,7 +78,7 @@ public function getValidTimes()
/**
* @dataProvider getInvalidTimes
*/
- public function testInvalidTimes($time)
+ public function testInvalidTimes($time, $code)
{
$constraint = new Time(array(
'message' => 'myMessage',
@@ -88,19 +88,20 @@ public function testInvalidTimes($time)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$time.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidTimes()
{
return array(
- array('foobar'),
- array('foobar 12:34:56'),
- array('12:34:56 foobar'),
- array('00:00'),
- array('24:00:00'),
- array('00:60:00'),
- array('00:00:60'),
+ array('foobar', Time::INVALID_FORMAT_ERROR),
+ array('foobar 12:34:56', Time::INVALID_FORMAT_ERROR),
+ array('12:34:56 foobar', Time::INVALID_FORMAT_ERROR),
+ array('00:00', Time::INVALID_FORMAT_ERROR),
+ array('24:00:00', Time::INVALID_TIME_ERROR),
+ array('00:60:00', Time::INVALID_TIME_ERROR),
+ array('00:00:60', Time::INVALID_TIME_ERROR),
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
index b34ce8138b7072d6ba283842ef7e1bb447ed53f0..0abda39f02942355f0f12a73db66291839704fb5 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
@@ -55,9 +55,15 @@ public function testExpectsStringCompatibleType()
/**
* @dataProvider getValidStrictUuids
*/
- public function testValidStrictUuids($uuid)
+ public function testValidStrictUuids($uuid, $versions = null)
{
- $this->validator->validate($uuid, new Uuid());
+ $constraint = new Uuid();
+
+ if (null !== $versions) {
+ $constraint->versions = $versions;
+ }
+
+ $this->validator->validate($uuid, $constraint);
$this->assertNoViolation();
}
@@ -66,75 +72,81 @@ public function getValidStrictUuids()
{
return array(
array('216fff40-98d9-11e3-a5e2-0800200c9a66'), // Version 1 UUID in lowercase
+ array('216fff40-98d9-11e3-a5e2-0800200c9a66', array(Uuid::V1_MAC)),
array('216FFF40-98D9-11E3-A5E2-0800200C9A66'), // Version 1 UUID in UPPERCASE
array('456daefb-5aa6-41b5-8dbc-068b05a8b201'), // Version 4 UUID in lowercase
- array('456DAEFb-5AA6-41B5-8DBC-068B05A8B201'), // Version 4 UUID in UPPERCASE
+ array('456daEFb-5AA6-41B5-8DBC-068B05A8B201'), // Version 4 UUID in mixed case
+ array('456daEFb-5AA6-41B5-8DBC-068B05A8B201', array(Uuid::V4_RANDOM)),
);
}
/**
* @dataProvider getInvalidStrictUuids
*/
- public function testInvalidStrictUuids($uuid)
+ public function testInvalidStrictUuids($uuid, $code, $versions = null)
{
$constraint = new Uuid(array(
'message' => 'testMessage',
));
+ if (null !== $versions) {
+ $constraint->versions = $versions;
+ }
+
$this->validator->validate($uuid, $constraint);
$this->buildViolation('testMessage')
->setParameter('{{ value }}', '"'.$uuid.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidStrictUuids()
{
return array(
- array('216fff40-98d9-11e3-a5e2-0800200c9a6'), // Too few characters
- array('216fff40-98d9-11e3-a5e2-0800200c9a666'), // Too many characters
- array('V16fff40-98d9-11e3-a5e2-0800200c9a66'), // Invalid character 'V'
- array('2-16fff-4098d-911e3a5e20-800-200c9-a66'), // Non-standard dash positions (randomly placed)
-
- // Non-standard UUIDs allowed by some other systems
- array('216f-ff40-98d9-11e3-a5e2-0800-200c-9a66'), // Non-standard dash positions (every 4 chars)
- array('216fff40-98d911e3-a5e20800-200c9a66'), // Non-standard dash positions (every 8 chars)
- array('216fff4098d911e3a5e20800200c9a66'), // No dashes at all
- array('{216fff40-98d9-11e3-a5e2-0800200c9a66}'), // Wrapped with curly braces
+ array('216fff40-98d9-11e3-a5e2_0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216Gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216fff40-98d9-11e3-a5e-20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216f-ff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800-200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800200c-9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216fff40-98d9-11e3-a5e20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216fff4098d911e3a5e20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800200c9a6', Uuid::TOO_SHORT_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800200c9a666', Uuid::TOO_LONG_ERROR),
+ array('216fff40-98d9-01e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-61e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-71e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-81e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-91e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-a1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-b1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-c1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-d1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-e1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-f1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR, array(Uuid::V2_DCE, Uuid::V3_MD5, Uuid::V4_RANDOM, Uuid::V5_SHA1)),
+ array('216fff40-98d9-21e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR, array(Uuid::V1_MAC, Uuid::V3_MD5, Uuid::V4_RANDOM, Uuid::V5_SHA1)),
+ array('216fff40-98d9-11e3-05e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-15e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-25e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-35e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-45e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-55e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-65e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-75e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-c5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-d5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-e5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+ array('216fff40-98d9-11e3-f5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+
+ // Non-standard UUID allowed by some other systems
+ array('{216fff40-98d9-11e3-a5e2-0800200c9a66}', Uuid::INVALID_CHARACTERS_ERROR),
+ array('[216fff40-98d9-11e3-a5e2-0800200c9a66]', Uuid::INVALID_CHARACTERS_ERROR),
);
}
- /**
- * @dataProvider getValidStrictUuids
- */
- public function testVersionConstraintIsValid($uuid)
- {
- $constraint = new Uuid(array(
- 'versions' => array(Uuid::V1_MAC, Uuid::V4_RANDOM),
- ));
-
- $this->validator->validate($uuid, $constraint);
-
- $this->assertNoViolation();
- }
-
- /**
- * @dataProvider getValidStrictUuids
- */
- public function testVersionConstraintIsInvalid($uuid)
- {
- $constraint = new Uuid(array(
- 'versions' => array(Uuid::V2_DCE, Uuid::V3_MD5),
- 'message' => 'myMessage',
- ));
-
- $this->validator->validate($uuid, $constraint);
-
- $this->buildViolation('myMessage')
- ->setParameter('{{ value }}', '"'.$uuid.'"')
- ->assertRaised();
- }
-
/**
* @dataProvider getValidNonStrictUuids
*/
@@ -155,20 +167,21 @@ public function getValidNonStrictUuids()
array('216fff40-98d9-11e3-a5e2-0800200c9a66'), // Version 1 UUID in lowercase
array('216FFF40-98D9-11E3-A5E2-0800200C9A66'), // Version 1 UUID in UPPERCASE
array('456daefb-5aa6-41b5-8dbc-068b05a8b201'), // Version 4 UUID in lowercase
- array('456DAEFb-5AA6-41B5-8DBC-068B05A8B201'), // Version 4 UUID in UPPERCASE
+ array('456DAEFb-5AA6-41B5-8DBC-068b05a8B201'), // Version 4 UUID in mixed case
// Non-standard UUIDs allowed by some other systems
array('216f-ff40-98d9-11e3-a5e2-0800-200c-9a66'), // Non-standard dash positions (every 4 chars)
array('216fff40-98d911e3-a5e20800-200c9a66'), // Non-standard dash positions (every 8 chars)
array('216fff4098d911e3a5e20800200c9a66'), // No dashes at all
array('{216fff40-98d9-11e3-a5e2-0800200c9a66}'), // Wrapped with curly braces
+ array('[216fff40-98d9-11e3-a5e2-0800200c9a66]'), // Wrapped with squared braces
);
}
/**
* @dataProvider getInvalidNonStrictUuids
*/
- public function testInvalidNonStrictUuids($uuid)
+ public function testInvalidNonStrictUuids($uuid, $code)
{
$constraint = new Uuid(array(
'strict' => false,
@@ -179,16 +192,20 @@ public function testInvalidNonStrictUuids($uuid)
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"'.$uuid.'"')
+ ->setCode($code)
->assertRaised();
}
public function getInvalidNonStrictUuids()
{
return array(
- array('216fff40-98d9-11e3-a5e2-0800200c9a6'), // Too few characters
- array('216fff40-98d9-11e3-a5e2-0800200c9a666'), // Too many characters
- array('V16fff40-98d9-11e3-a5e2-0800200c9a66'), // Invalid character 'V'
- array('2-16fff-4098d-911e3a5e20-800-200c9-a66'), // Non-standard dash positions (randomly placed)
+ array('216fff40-98d9-11e3-a5e2_0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216Gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216fff40-98d9-11e3-a5e2_0800200c9a6', Uuid::INVALID_CHARACTERS_ERROR),
+ array('216fff40-98d9-11e3-a5e-20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800200c9a6', Uuid::TOO_SHORT_ERROR),
+ array('216fff40-98d9-11e3-a5e2-0800200c9a666', Uuid::TOO_LONG_ERROR),
);
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ExecutionContextTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ExecutionContextTest.php
index c0828d4add067422cc7c1d541db77351b0a8f3b3..3b54a9e4720b834b4fdbc98d56eb32ae75d42064 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ExecutionContextTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/ExecutionContextTest.php
@@ -283,7 +283,7 @@ public function testGetPropertyPathWithNestedCollectionsAndAllMixed()
$constraints = new Collection(array(
'shelves' => new All(array('constraints' => array(
new Collection(array(
- 'name' => new ConstraintA(),
+ 'name' => new ConstraintA(),
'books' => new All(array('constraints' => array(
new ConstraintA(),
))),
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php
index 5ae0e68a777e879c9acce9981b4d67cf12b386ae..8c76a21598c0aee2492151a6ef57ad98f61e9fd4 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php
@@ -15,7 +15,7 @@
class FakeClassMetadata extends ClassMetadata
{
- public function addPropertyMetadata($propertyName, $metadata)
+ public function addCustomPropertyMetadata($propertyName, $metadata)
{
if (!isset($this->members[$propertyName])) {
$this->members[$propertyName] = array();
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
index b9f6faee5abe97602fc3ad90bf6b231cd0909c31..782f8225de6872fc960766083c8797e3f55c5630 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -58,6 +58,55 @@ public function testAddPropertyConstraints()
$this->assertEquals(array('firstName', 'lastName'), $this->metadata->getConstrainedProperties());
}
+ public function testAddMultiplePropertyConstraints()
+ {
+ $this->metadata->addPropertyConstraints('lastName', array(new ConstraintA(), new ConstraintB()));
+
+ $constraints = array(
+ new ConstraintA(array('groups' => array('Default', 'Entity'))),
+ new ConstraintB(array('groups' => array('Default', 'Entity'))),
+ );
+
+ $properties = $this->metadata->getPropertyMetadata('lastName');
+
+ $this->assertCount(1, $properties);
+ $this->assertEquals('lastName', $properties[0]->getName());
+ $this->assertEquals($constraints, $properties[0]->getConstraints());
+ }
+
+ public function testAddGetterConstraints()
+ {
+ $this->metadata->addGetterConstraint('lastName', new ConstraintA());
+ $this->metadata->addGetterConstraint('lastName', new ConstraintB());
+
+ $constraints = array(
+ new ConstraintA(array('groups' => array('Default', 'Entity'))),
+ new ConstraintB(array('groups' => array('Default', 'Entity'))),
+ );
+
+ $properties = $this->metadata->getPropertyMetadata('lastName');
+
+ $this->assertCount(1, $properties);
+ $this->assertEquals('getLastName', $properties[0]->getName());
+ $this->assertEquals($constraints, $properties[0]->getConstraints());
+ }
+
+ public function testAddMultipleGetterConstraints()
+ {
+ $this->metadata->addGetterConstraints('lastName', array(new ConstraintA(), new ConstraintB()));
+
+ $constraints = array(
+ new ConstraintA(array('groups' => array('Default', 'Entity'))),
+ new ConstraintB(array('groups' => array('Default', 'Entity'))),
+ );
+
+ $properties = $this->metadata->getPropertyMetadata('lastName');
+
+ $this->assertCount(1, $properties);
+ $this->assertEquals('getLastName', $properties[0]->getName());
+ $this->assertEquals($constraints, $properties[0]->getConstraints());
+ }
+
public function testMergeConstraintsMergesClassConstraints()
{
$parent = new ClassMetadata(self::PARENTCLASS);
@@ -101,7 +150,7 @@ public function testMergeConstraintsMergesMemberConstraints()
))),
);
- $members = $this->metadata->getMemberMetadatas('firstName');
+ $members = $this->metadata->getPropertyMetadata('firstName');
$this->assertCount(1, $members);
$this->assertEquals(self::PARENTCLASS, $members[0]->getClassName());
@@ -112,8 +161,8 @@ public function testMemberMetadatas()
{
$this->metadata->addPropertyConstraint('firstName', new ConstraintA());
- $this->assertTrue($this->metadata->hasMemberMetadatas('firstName'));
- $this->assertFalse($this->metadata->hasMemberMetadatas('non_existant_field'));
+ $this->assertTrue($this->metadata->hasPropertyMetadata('firstName'));
+ $this->assertFalse($this->metadata->hasPropertyMetadata('non_existant_field'));
}
public function testMergeConstraintsKeepsPrivateMembersSeparate()
@@ -138,7 +187,7 @@ public function testMergeConstraintsKeepsPrivateMembersSeparate()
))),
);
- $members = $this->metadata->getMemberMetadatas('internal');
+ $members = $this->metadata->getPropertyMetadata('internal');
$this->assertCount(2, $members);
$this->assertEquals(self::PARENTCLASS, $members[0]->getClassName());
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
index 62fa87ccf7f5cd9940767c255b17d18438a6d5ba..c214b9c07bc5a93a4e0660a0bf9c4a6a92981303 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
@@ -21,6 +21,7 @@
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\MetadataFactoryInterface;
use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\FailingConstraint;
use Symfony\Component\Validator\Tests\Fixtures\FakeClassMetadata;
use Symfony\Component\Validator\Tests\Fixtures\Reference;
use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -573,7 +574,7 @@ public function testAddCustomizedViolation()
->setParameter('%param%', 'value')
->setInvalidValue('Invalid value')
->setPlural(2)
- ->setCode('Code')
+ ->setCode(42)
->addViolation();
};
@@ -590,7 +591,7 @@ public function testAddCustomizedViolation()
$this->assertSame($entity, $violations[0]->getRoot());
$this->assertSame('Invalid value', $violations[0]->getInvalidValue());
$this->assertSame(2, $violations[0]->getMessagePluralization());
- $this->assertSame('Code', $violations[0]->getCode());
+ $this->assertSame(42, $violations[0]->getCode());
}
/**
@@ -640,7 +641,7 @@ public function testPropertyMetadataMustImplementPropertyMetadataInterface()
// Legacy interface
$propertyMetadata = $this->getMock('Symfony\Component\Validator\MetadataInterface');
$metadata = new FakeClassMetadata(get_class($entity));
- $metadata->addPropertyMetadata('firstName', $propertyMetadata);
+ $metadata->addCustomPropertyMetadata('firstName', $propertyMetadata);
$this->metadataFactory->addMetadata($metadata);
@@ -760,4 +761,13 @@ public function testInitializeObjectsOnFirstValidation()
$this->assertTrue($entity->initialized);
}
+
+ public function testPassConstraintToViolation()
+ {
+ $constraint = new FailingConstraint();
+ $violations = $this->validate('Foobar', $constraint);
+
+ $this->assertCount(1, $violations);
+ $this->assertSame($constraint, $violations[0]->getConstraint());
+ }
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 29d0c6c00c71c06a19c50c8558986cd0ab05a7ba..2da1887afd338e75cef84835feb4eab970f8fb68 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -856,6 +856,8 @@ private function validateInGroup($value, $cacheKey, MetadataInterface $metadata,
$context->markConstraintAsValidated($cacheKey, $constraintHash);
}
+ $context->setConstraint($constraint);
+
$validator = $this->validatorFactory->getInstance($constraint);
$validator->initialize($context);
$validator->validate($value, $constraint);
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ValidatorBuilder.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ValidatorBuilder.php
index ba6fa0c805fac3d72476d9217603d83b9fa2554e..103fb5a9d3a9684b7fea16238f37c9a6afefc281 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/ValidatorBuilder.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ValidatorBuilder.php
@@ -62,27 +62,27 @@ class ValidatorBuilder implements ValidatorBuilderInterface
private $methodMappings = array();
/**
- * @var Reader
+ * @var Reader|null
*/
- private $annotationReader = null;
+ private $annotationReader;
/**
- * @var MetadataFactoryInterface
+ * @var MetadataFactoryInterface|null
*/
private $metadataFactory;
/**
- * @var ConstraintValidatorFactoryInterface
+ * @var ConstraintValidatorFactoryInterface|null
*/
private $validatorFactory;
/**
- * @var CacheInterface
+ * @var CacheInterface|null
*/
private $metadataCache;
/**
- * @var TranslatorInterface
+ * @var TranslatorInterface|null
*/
private $translator;
@@ -92,12 +92,12 @@ class ValidatorBuilder implements ValidatorBuilderInterface
private $translationDomain;
/**
- * @var PropertyAccessorInterface
+ * @var PropertyAccessorInterface|null
*/
private $propertyAccessor;
/**
- * @var int
+ * @var int|null
*/
private $apiVersion;
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
index 969b79cdeddd5c9f238e9ecd4d699068900376b0..b752c397b8805150a1bc4d8ce14c995eb865493e 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Violation;
use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\Util\PropertyPath;
@@ -72,12 +73,22 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
*/
private $plural;
+ /**
+ * @var Constraint
+ */
+ private $constraint;
+
/**
* @var mixed
*/
private $code;
- public function __construct(ConstraintViolationList $violations, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null)
+ /**
+ * @var mixed
+ */
+ private $cause;
+
+ public function __construct(ConstraintViolationList $violations, Constraint $constraint, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null)
{
$this->violations = $violations;
$this->message = $message;
@@ -87,6 +98,7 @@ public function __construct(ConstraintViolationList $violations, $message, array
$this->invalidValue = $invalidValue;
$this->translator = $translator;
$this->translationDomain = $translationDomain;
+ $this->constraint = $constraint;
}
/**
@@ -159,6 +171,16 @@ public function setCode($code)
return $this;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function setCause($cause)
+ {
+ $this->cause = $cause;
+
+ return $this;
+ }
+
/**
* {@inheritdoc}
*/
@@ -195,7 +217,9 @@ public function addViolation()
$this->propertyPath,
$this->invalidValue,
$this->plural,
- $this->code
+ $this->code,
+ $this->constraint,
+ $this->cause
));
}
}
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
index 84cd4d32548ddf6517aafe55426d28d9ad16cc30..5998cbe529d17fc6f9929e701bb8c1a676752178 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
@@ -93,14 +93,21 @@ public function setPlural($number);
/**
* Sets the violation code.
*
- * @param mixed $code The violation code
+ * @param int $code The violation code
*
* @return ConstraintViolationBuilderInterface This builder
- *
- * @internal This method is internal and should not be used by user code
*/
public function setCode($code);
+ /**
+ * Sets the cause of the violation.
+ *
+ * @param mixed $cause The cause of the violation
+ *
+ * @return ConstraintViolationBuilderInterface This builder
+ */
+ public function setCause($cause);
+
/**
* Adds the violation to the current execution context.
*/
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php
index 06cfdb60fbd5b24ea8d5d980eaf5e204390fdd4b..0607552cfc886fbf8695a768c108ddc2c3a2bdea 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php
@@ -11,12 +11,7 @@
namespace Symfony\Component\Validator\Violation;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintViolation;
-use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ExecutionContextInterface;
-use Symfony\Component\Validator\Util\PropertyPath;
/**
* Backwards-compatible implementation of {@link ConstraintViolationBuilderInterface}.
@@ -149,6 +144,16 @@ public function setCode($code)
return $this;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function setCause($cause)
+ {
+ // do nothing - we can't save the cause through the old API
+
+ return $this;
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/composer.json b/core/vendor/symfony/validator/Symfony/Component/Validator/composer.json
index 299603b3a678c96dd92b723457475ba7666b4d30..d758695002cbafdd5a2a78df887f3241ee6a0881 100644
--- a/core/vendor/symfony/validator/Symfony/Component/Validator/composer.json
+++ b/core/vendor/symfony/validator/Symfony/Component/Validator/composer.json
@@ -49,7 +49,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
index 7f6ec2bef297d300bf533b79eaba5f1b6ed3cebe..dc9705f4cf8aca0407204e07516a8b628d971284 100644
--- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
+++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
@@ -32,7 +32,7 @@ class Escaper
"\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
"\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
"\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",);
- private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
+ private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
"\\0", "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\a",
"\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "\\x0e", "\\x0f",
"\\x10", "\\x11", "\\x12", "\\x13", "\\x14", "\\x15", "\\x16", "\\x17",
diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
index c3b8470938aa377a30fce4865c72fb87b59ebb54..a1b6a27e991afc8211b32388970698c80b431677 100644
--- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
+++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
@@ -22,11 +22,11 @@ class Parser
{
const FOLDED_SCALAR_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
- private $offset = 0;
- private $lines = array();
- private $currentLineNb = -1;
- private $currentLine = '';
- private $refs = array();
+ private $offset = 0;
+ private $lines = array();
+ private $currentLineNb = -1;
+ private $currentLine = '';
+ private $refs = array();
/**
* Constructor
@@ -229,6 +229,11 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
}
}
} else {
+ // multiple documents are not supported
+ if ('---' === $this->currentLine) {
+ throw new ParseException('Multiple documents are not supported.');
+ }
+
// 1-liner optionally followed by newline
$lineCount = count($this->lines);
if (1 === $lineCount || (2 === $lineCount && empty($this->lines[1]))) {
diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
index b011236f9a6117697e95b9bb5bfea1e9a6045480..0a8b5defd038b4db30019e6e7bfea16651813b78 100644
--- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
+++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
@@ -463,9 +463,9 @@ yaml: |
0.278 Batting Average
php: |
array(
- 'name' => 'Mark McGwire',
+ 'name' => 'Mark McGwire',
'accomplishment' => "Mark set a major league home run record in 1998.\n",
- 'stats' => "65 Home Runs\n0.278 Batting Average\n"
+ 'stats' => "65 Home Runs\n0.278 Batting Average\n"
)
---
test: Quoted scalars
diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
index da248d7dec0dfd33252c8e858983df520f1dcc32..7f16d925e44022d98da57e3021619cc714aa52b4 100644
--- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -482,6 +482,27 @@ public function testUnindentedCollectionException()
$this->parser->parse($yaml);
}
+ /**
+ * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+ * @expectedExceptionMessage Multiple documents are not supported.
+ */
+ public function testMultipleDocumentsNotSupportedException()
+ {
+ Yaml::parse(<<<EOL
+# Ranking of 1998 home runs
+---
+- Mark McGwire
+- Sammy Sosa
+- Ken Griffey
+
+# Team ranking
+---
+- Chicago Cubs
+- St Louis Cardinals
+EOL
+ );
+ }
+
/**
* @expectedException \Symfony\Component\Yaml\Exception\ParseException
*/
@@ -624,7 +645,7 @@ public function testFoldedStringBlockWithComments()
public function testNestedFoldedStringBlockWithComments()
{
$this->assertEquals(array(array(
- 'title' => 'some title',
+ 'title' => 'some title',
'content' => <<<EOT
# comment 1
header