diff --git a/composer.lock b/composer.lock index 3253536..1ddf3ec 100644 --- a/composer.lock +++ b/composer.lock @@ -9,18 +9,21 @@ "packages": [ { "name": "composer/installers", - "version": "v1.0.21", + "version": "v1.0.22", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45" + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45", - "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45", + "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", "shasum": "" }, + "require": { + "composer-plugin-api": "1.0.0" + }, "replace": { "roundcube/plugin-installer": "*", "shama/baton": "*" @@ -29,9 +32,9 @@ "composer/composer": "1.0.*@dev", "phpunit/phpunit": "4.1.*" }, - "type": "composer-installer", + "type": "composer-plugin", "extra": { - "class": "Composer\\Installers\\Installer", + "class": "Composer\\Installers\\Plugin", "branch-alias": { "dev-master": "1.0-dev" } @@ -100,33 +103,33 @@ "zend", "zikula" ], - "time": "2015-02-18 17:17:01" + "time": "2015-10-29 23:28:48" }, { "name": "composer/semver", - "version": "1.0.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba" + "reference": "0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/d0e1ccc6d44ab318b758d709e19176037da6b1ba", - "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba", + "url": "https://api.github.com/repos/composer/semver/zipball/0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3", + "reference": "0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^5.3.2 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "~2.3" + "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.1-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -140,10 +143,6 @@ ], "authors": [ { - "name": "Rob Bast", - "email": "rob.bast@gmail.com" - }, - { "name": "Nils Adermann", "email": "naderman@naderman.de", "homepage": "http://www.naderman.de" @@ -152,6 +151,11 @@ "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" } ], "description": "Semver library that offers utilities, version constraint parsing and validation.", @@ -161,7 +165,7 @@ "validation", "versioning" ], - "time": "2015-09-21 09:42:36" + "time": "2015-11-10 11:17:42" }, { "name": "doctrine/annotations", @@ -233,16 +237,16 @@ }, { "name": "doctrine/cache", - "version": "v1.4.2", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", + "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", "shasum": "" }, "require": { @@ -263,8 +267,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Cache\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" } }, "notification-url": "https://packagist.org/downloads/", @@ -299,7 +303,7 @@ "cache", "caching" ], - "time": "2015-08-31 12:36:41" + "time": "2015-11-02 18:35:48" }, { "name": "doctrine/collections", @@ -442,16 +446,16 @@ }, { "name": "doctrine/inflector", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604" + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "shasum": "" }, "require": { @@ -463,7 +467,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -505,7 +509,7 @@ "singularize", "string" ], - "time": "2014-12-20 21:24:13" + "time": "2015-11-06 14:35:42" }, { "name": "doctrine/lexer", @@ -625,16 +629,16 @@ }, { "name": "egulias/email-validator", - "version": "1.2.9", + "version": "1.2.11", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1" + "reference": "04c6cdf9871140b80947c87db7770c0dd9c75c7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1", - "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/04c6cdf9871140b80947c87db7770c0dd9c75c7c", + "reference": "04c6cdf9871140b80947c87db7770c0dd9c75c7c", "shasum": "" }, "require": { @@ -674,20 +678,20 @@ "validation", "validator" ], - "time": "2015-06-22 21:07:51" + "time": "2015-11-11 03:28:32" }, { "name": "guzzlehttp/guzzle", - "version": "6.1.0", + "version": "6.1.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81" + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd14b4d0b8f2389eaf37c5458608c7cb793a81", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c", "shasum": "" }, "require": { @@ -736,20 +740,20 @@ "rest", "web service" ], - "time": "2015-09-08 17:36:26" + "time": "2015-11-23 00:47:50" }, { "name": "guzzlehttp/promises", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "97fe7210def29451ec74923b27e552238defd75a" + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/97fe7210def29451ec74923b27e552238defd75a", - "reference": "97fe7210def29451ec74923b27e552238defd75a", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea", "shasum": "" }, "require": { @@ -787,20 +791,20 @@ "keywords": [ "promise" ], - "time": "2015-08-15 19:37:21" + "time": "2015-10-15 22:28:00" }, { "name": "guzzlehttp/psr7", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e" + "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/4ef919b0cf3b1989523138b60163bbcb7ba1ff7e", - "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/4d0bdbe1206df7440219ce14c972aa57cc5e4982", + "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982", "shasum": "" }, "require": { @@ -845,7 +849,49 @@ "stream", "uri" ], - "time": "2015-08-15 19:32:36" + "time": "2015-11-03 01:34:55" + }, + { + "name": "ircmaxell/password-compat", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "type": "library", + "autoload": { + "files": [ + "lib/password.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" + } + ], + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", + "keywords": [ + "hashing", + "password" + ], + "time": "2014-11-20 16:49:30" }, { "name": "masterminds/html5", @@ -1107,34 +1153,37 @@ }, { "name": "symfony/class-loader", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4" + "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/320f8d2a9cdbcbeb24be602c124aae9d998474a4", - "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/51f83451bf0ddfc696e47e4642d6cd10fcfce160", + "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160", "shasum": "" }, "require": { "php": ">=5.3.9" }, "require-dev": { - "symfony/finder": "~2.0,>=2.0.5" + "symfony/finder": "~2.0,>=2.0.5|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\ClassLoader\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1152,29 +1201,30 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2015-10-23 14:47:27" + "time": "2015-11-26 07:00:59" }, { "name": "symfony/console", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5efd632294c8320ea52492db22292ff853a43766" + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766", - "reference": "5efd632294c8320ea52492db22292ff853a43766", + "url": "https://api.github.com/repos/symfony/console/zipball/d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1184,13 +1234,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1208,20 +1261,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-10-20 14:38:46" + "time": "2015-11-30 12:35:10" }, { "name": "symfony/debug", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b" + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fb9e6887db716939f41af0ba8ef38a1582eb501b", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b", + "url": "https://api.github.com/repos/symfony/debug/zipball/0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", "shasum": "" }, "require": { @@ -1244,7 +1297,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1262,20 +1318,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-10-30 20:10:21" }, { "name": "symfony/dependency-injection", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "af284e795ec8a08c80d1fc47518fd23004b89847" + "reference": "1ac8ce1a1cff7ff9467d44bc71b0f71dfa751ba4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/af284e795ec8a08c80d1fc47518fd23004b89847", - "reference": "af284e795ec8a08c80d1fc47518fd23004b89847", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1ac8ce1a1cff7ff9467d44bc71b0f71dfa751ba4", + "reference": "1ac8ce1a1cff7ff9467d44bc71b0f71dfa751ba4", "shasum": "" }, "require": { @@ -1285,9 +1341,9 @@ "symfony/expression-language": "<2.6" }, "require-dev": { - "symfony/config": "~2.2", - "symfony/expression-language": "~2.6", - "symfony/yaml": "~2.1" + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/yaml": "~2.1|~3.0.0" }, "suggest": { "symfony/config": "", @@ -1297,13 +1353,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1321,20 +1380,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2015-10-27 15:38:06" + "time": "2015-11-30 06:56:28" }, { "name": "symfony/event-dispatcher", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8" + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", "shasum": "" }, "require": { @@ -1342,10 +1401,10 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/stopwatch": "~2.3" + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1354,13 +1413,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1378,40 +1440,41 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-10-30 20:15:42" }, { "name": "symfony/http-foundation", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7598eea151ae3d4134df1f9957364b17809eea75" + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7598eea151ae3d4134df1f9957364b17809eea75", - "reference": "7598eea151ae3d4134df1f9957364b17809eea75", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-php54": "~1.0" }, "require-dev": { - "symfony/expression-language": "~2.4" + "symfony/expression-language": "~2.4|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1430,48 +1493,48 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2015-10-23 14:47:27" + "time": "2015-11-27 11:03:19" }, { "name": "symfony/http-kernel", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77" + "reference": "a77cf7e6fe1f3ac158b2eb17f89e8efdf7820905" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4260f2273a446a6715063dc9ca89fd0c475c2f77", - "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a77cf7e6fe1f3ac158b2eb17f89e8efdf7820905", + "reference": "a77cf7e6fe1f3ac158b2eb17f89e8efdf7820905", "shasum": "" }, "require": { "php": ">=5.3.9", "psr/log": "~1.0", "symfony/debug": "~2.6,>=2.6.2", - "symfony/event-dispatcher": "~2.6,>=2.6.7", - "symfony/http-foundation": "~2.5,>=2.5.4" + "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", + "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0" }, "conflict": { "symfony/config": "<2.7" }, "require-dev": { - "symfony/browser-kit": "~2.3", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.7", - "symfony/console": "~2.3", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.2", - "symfony/dom-crawler": "~2.0,>=2.0.5", - "symfony/expression-language": "~2.4", - "symfony/finder": "~2.0,>=2.0.5", - "symfony/process": "~2.0,>=2.0.5", - "symfony/routing": "~2.2", - "symfony/stopwatch": "~2.3", - "symfony/templating": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/var-dumper": "~2.6" + "symfony/browser-kit": "~2.3|~3.0.0", + "symfony/class-loader": "~2.1|~3.0.0", + "symfony/config": "~2.8", + "symfony/console": "~2.3|~3.0.0", + "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.8|~3.0.0", + "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/finder": "~2.0,>=2.0.5|~3.0.0", + "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/routing": "~2.8|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0", + "symfony/templating": "~2.2|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/var-dumper": "~2.6|~3.0.0" }, "suggest": { "symfony/browser-kit": "", @@ -1485,13 +1548,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\HttpKernel\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1509,20 +1575,190 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2015-10-27 19:07:21" + "time": "2015-11-30 17:25:56" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-php54", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/polyfill-php55", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "shasum": "" + }, + "require": { + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" }, { "name": "symfony/process", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7" + "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7", - "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7", + "url": "https://api.github.com/repos/symfony/process/zipball/1b988a88e3551102f3c2d9e1d47a18c3a78d6312", + "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312", "shasum": "" }, "require": { @@ -1531,13 +1767,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Process\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1555,7 +1794,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-10-23 14:47:27" + "time": "2015-11-30 12:35:10" }, { "name": "symfony/psr-http-message-bridge", @@ -1613,16 +1852,16 @@ }, { "name": "symfony/routing", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f353e1f588679c3ec987624e6c617646bd01ba38" + "reference": "f76830dc0f8068df36226dc822e7fc1f5f73be46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f353e1f588679c3ec987624e6c617646bd01ba38", - "reference": "f353e1f588679c3ec987624e6c617646bd01ba38", + "url": "https://api.github.com/repos/symfony/routing/zipball/f76830dc0f8068df36226dc822e7fc1f5f73be46", + "reference": "f76830dc0f8068df36226dc822e7fc1f5f73be46", "shasum": "" }, "require": { @@ -1635,27 +1874,31 @@ "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" + "symfony/config": "~2.7|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/http-foundation": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", "symfony/config": "For using the all-in-one router or any loader", + "symfony/dependency-injection": "For loading routes from a service", "symfony/expression-language": "For using expression matching", "symfony/yaml": "For using the YAML loader" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Routing\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1679,31 +1922,32 @@ "uri", "url" ], - "time": "2015-10-27 15:38:06" + "time": "2015-11-26 07:00:59" }, { "name": "symfony/serializer", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "14056684acad23b8815eb336bccc0b4ac76bd823" + "reference": "aab4ce70b7d1ae7290388172141e776de18d4a1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/14056684acad23b8815eb336bccc0b4ac76bd823", - "reference": "14056684acad23b8815eb336bccc0b4ac76bd823", + "url": "https://api.github.com/repos/symfony/serializer/zipball/aab4ce70b7d1ae7290388172141e776de18d4a1f", + "reference": "aab4ce70b7d1ae7290388172141e776de18d4a1f", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-php55": "~1.0" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", - "symfony/config": "~2.2", - "symfony/property-access": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" + "symfony/config": "~2.2|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", @@ -1715,13 +1959,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Serializer\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1739,33 +1986,34 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-28 10:40:16" }, { "name": "symfony/translation", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8" + "reference": "6772657767649fc3b31df12705194fb4af11ef98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8", - "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8", + "url": "https://api.github.com/repos/symfony/translation/zipball/6772657767649fc3b31df12705194fb4af11ef98", + "reference": "6772657767649fc3b31df12705194fb4af11ef98", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { "symfony/config": "<2.7" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/intl": "~2.4", - "symfony/yaml": "~2.2" + "symfony/config": "~2.8", + "symfony/intl": "~2.4|~3.0.0", + "symfony/yaml": "~2.2|~3.0.0" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -1775,13 +2023,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Translation\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1799,37 +2050,36 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2015-10-27 15:38:06" + "time": "2015-11-18 13:45:00" }, { "name": "symfony/validator", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "df9021e689aa3d08367881e7f8917219fabe5e64" + "reference": "8c42b96f5b23f0642c1a518addafcef8077154a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/df9021e689aa3d08367881e7f8917219fabe5e64", - "reference": "df9021e689aa3d08367881e7f8917219fabe5e64", + "url": "https://api.github.com/repos/symfony/validator/zipball/8c42b96f5b23f0642c1a518addafcef8077154a2", + "reference": "8c42b96f5b23f0642c1a518addafcef8077154a2", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/translation": "~2.4" + "symfony/translation": "~2.4|~3.0.0" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", - "doctrine/common": "~2.3", "egulias/email-validator": "~1.2,>=1.2.1", - "symfony/config": "~2.2", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.1", - "symfony/intl": "~2.4", - "symfony/property-access": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/http-foundation": "~2.1|~3.0.0", + "symfony/intl": "~2.4|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", @@ -1845,13 +2095,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Validator\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1869,20 +2122,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2015-10-18 20:23:18" + "time": "2015-11-20 14:39:26" }, { "name": "symfony/yaml", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f79824187de95064a2f5038904c4d7f0227fedb5", + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5", "shasum": "" }, "require": { @@ -1891,13 +2144,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1915,7 +2171,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-30 12:35:10" }, { "name": "twig/twig", @@ -2029,16 +2285,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.1.3", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181" + "reference": "edfda00b9831630c19c411f85f50a47bb66af457" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181", - "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/edfda00b9831630c19c411f85f50a47bb66af457", + "reference": "edfda00b9831630c19c411f85f50a47bb66af457", "shasum": "" }, "require": { @@ -2055,8 +2311,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" } }, "autoload": { @@ -2075,7 +2331,7 @@ "psr", "psr-7" ], - "time": "2015-08-10 20:04:20" + "time": "2015-11-24 19:16:22" }, { "name": "zendframework/zend-escaper", @@ -2123,16 +2379,16 @@ }, { "name": "zendframework/zend-feed", - "version": "2.5.2", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-feed.git", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54" + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", "shasum": "" }, "require": { @@ -2143,24 +2399,25 @@ "require-dev": { "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", + "psr/http-message": "^1.0", "zendframework/zend-cache": "~2.5", "zendframework/zend-db": "~2.5", "zendframework/zend-http": "~2.5", - "zendframework/zend-servicemanager": "~2.5", "zendframework/zend-validator": "~2.5" }, "suggest": { - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-db": "Zend\\Db component", + "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", "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" + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { @@ -2178,7 +2435,7 @@ "feed", "zf2" ], - "time": "2015-08-04 21:39:18" + "time": "2015-11-24 15:38:00" }, { "name": "zendframework/zend-hydrator", @@ -2238,16 +2495,16 @@ }, { "name": "zendframework/zend-stdlib", - "version": "2.7.3", + "version": "2.7.4", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc" + "reference": "cae029346a33663b998507f94962eb27de060683" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8ac0c77ff567fcf49b58689ee3bfa7595be102bc", - "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cae029346a33663b998507f94962eb27de060683", + "reference": "cae029346a33663b998507f94962eb27de060683", "shasum": "" }, "require": { @@ -2292,7 +2549,7 @@ "stdlib", "zf2" ], - "time": "2015-09-25 04:06:33" + "time": "2015-10-15 15:57:32" } ], "packages-dev": [ @@ -2521,24 +2778,24 @@ }, { "name": "fabpot/goutte", - "version": "v3.1.1", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc" + "reference": "3cbc6ed222422a28400e470050f14928a153207e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/751a3dc5c4d86ec3e97c9f27133ef9694d9243cc", - "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3cbc6ed222422a28400e470050f14928a153207e", + "reference": "3cbc6ed222422a28400e470050f14928a153207e", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", "php": ">=5.5.0", - "symfony/browser-kit": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1" + "symfony/browser-kit": "~2.1|~3.0", + "symfony/css-selector": "~2.1|~3.0", + "symfony/dom-crawler": "~2.1|~3.0" }, "type": "application", "extra": { @@ -2566,7 +2823,7 @@ "keywords": [ "scraper" ], - "time": "2015-08-29 16:16:56" + "time": "2015-11-05 12:58:44" }, { "name": "jcalderonzumba/gastonjs", @@ -3083,16 +3340,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.11", + "version": "4.8.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5" + "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bdd199472410fd7e32751f9c814c7e06f2c21bd5", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa33d4ad96481b91df343d83e8c8aabed6b1dfd3", + "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3", "shasum": "" }, "require": { @@ -3151,7 +3408,7 @@ "testing", "xunit" ], - "time": "2015-10-07 10:39:46" + "time": "2015-11-11 11:32:49" }, { "name": "phpunit/phpunit-mock-objects", @@ -3443,16 +3700,16 @@ }, { "name": "sebastian/global-state", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01" + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { @@ -3490,7 +3747,7 @@ "keywords": [ "global state" ], - "time": "2014-10-06 09:23:50" + "time": "2015-10-12 03:26:01" }, { "name": "sebastian/recursion-context", @@ -3582,16 +3839,16 @@ }, { "name": "symfony/browser-kit", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367" + "reference": "bd28847ea2193916074c7b11d4fdd78570049694" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/07d664a052572ccc28eb2ab7dbbe82155b1ad367", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/bd28847ea2193916074c7b11d4fdd78570049694", + "reference": "bd28847ea2193916074c7b11d4fdd78570049694", "shasum": "" }, "require": { @@ -3614,7 +3871,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\BrowserKit\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3632,20 +3892,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2015-10-23 14:47:27" + "time": "2015-11-02 20:20:53" }, { "name": "symfony/css-selector", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b" + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/abb47717fb88aebd9437da2fc8bb01a50a36679f", + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f", "shasum": "" }, "require": { @@ -3660,7 +3920,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3682,20 +3945,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-10-30 20:10:21" }, { "name": "symfony/dom-crawler", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612" + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5fef7d8b80d8f9992df99d8ee283f420484c9612", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b33593cbfe1d81b50d48353f338aca76a08658d8", + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8", "shasum": "" }, "require": { @@ -3716,7 +3979,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\DomCrawler\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3734,45 +4000,14 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-02 20:20:53" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "php": 0, - "symfony/class-loader": 0, - "symfony/console": 0, - "symfony/dependency-injection": 0, - "symfony/event-dispatcher": 0, - "symfony/http-foundation": 0, - "symfony/http-kernel": 0, - "symfony/routing": 0, - "symfony/serializer": 0, - "symfony/translation": 0, - "symfony/validator": 0, - "symfony/process": 0, - "symfony/yaml": 0, - "twig/twig": 0, - "doctrine/common": 0, - "doctrine/annotations": 0, - "guzzlehttp/guzzle": 0, - "symfony-cmf/routing": 0, - "easyrdf/easyrdf": 0, - "zendframework/zend-feed": 0, - "stack/builder": 0, - "egulias/email-validator": 0, - "masterminds/html5": 0, - "symfony/psr-http-message-bridge": 0, - "zendframework/zend-diactoros": 0, - "composer/semver": 0, - "behat/mink": 0, - "behat/mink-goutte-driver": 0, "jcalderonzumba/gastonjs": 20, - "jcalderonzumba/mink-phantomjs-driver": 20, - "mikey179/vfsstream": 0, - "phpunit/phpunit": 0, - "symfony/css-selector": 0 + "jcalderonzumba/mink-phantomjs-driver": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/core/composer.json b/core/composer.json index afb170a..442f4a6 100644 --- a/core/composer.json +++ b/core/composer.json @@ -5,18 +5,18 @@ "license": "GPL-2.0+", "require": { "php": ">=5.5.9", - "symfony/class-loader": "2.7.*", - "symfony/console": "2.7.*", - "symfony/dependency-injection": "2.7.*", - "symfony/event-dispatcher": "2.7.*", - "symfony/http-foundation": "~2.7.2", - "symfony/http-kernel": "2.7.*", - "symfony/routing": "2.7.*", - "symfony/serializer": "2.7.*", - "symfony/translation": "2.7.*", - "symfony/validator": "2.7.*", - "symfony/process": "2.7.*", - "symfony/yaml": "2.7.*", + "symfony/class-loader": "~2.8", + "symfony/console": "~2.8", + "symfony/dependency-injection": "~2.8", + "symfony/event-dispatcher": "~2.8", + "symfony/http-foundation": "~2.8", + "symfony/http-kernel": "~2.8", + "symfony/routing": "~2.8", + "symfony/serializer": "~2.8", + "symfony/translation": "~2.8", + "symfony/validator": "~2.8", + "symfony/process": "~2.8", + "symfony/yaml": "~2.8", "twig/twig": "^1.23.1", "doctrine/common": "2.5.*", "doctrine/annotations": "1.2.*", diff --git a/core/core.services.yml b/core/core.services.yml index afccb31..415d3ce 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -497,6 +497,7 @@ services: entity.manager: class: Drupal\Core\Entity\EntityManager parent: container.trait + deprecated: %service_id%-no-warning # @todo Remove this tag in https://www.drupal.org/node/2549143. tags: - { name: plugin_manager_cache_clear } @@ -1015,7 +1016,7 @@ services: class: Symfony\Component\HttpKernel\EventListener\RouterListener tags: - { name: event_subscriber } - arguments: ['@router', '@router.request_context', NULL, '@request_stack'] + arguments: ['@router', '@request_stack', '@router.request_context', NULL] bare_html_page_renderer: class: Drupal\Core\Render\BareHtmlPageRenderer arguments: ['@renderer', '@html_response.attachments_processor'] @@ -1297,71 +1298,71 @@ services: calls: - [setContainer, ['@service_container']] arguments: ['feed.writer.'] -# Zend Feed reader plugins. Plugins should be set as prototype scope. +# Zend Feed reader plugins. Plugin instances should not be shared. feed.reader.dublincoreentry: class: Zend\Feed\Reader\Extension\DublinCore\Entry - scope: prototype + shared: false feed.reader.dublincorefeed: class: Zend\Feed\Reader\Extension\DublinCore\Feed - scope: prototype + shared: false feed.reader.contententry: class: Zend\Feed\Reader\Extension\Content\Entry - scope: prototype + shared: false feed.reader.atomentry: class: Zend\Feed\Reader\Extension\Atom\Entry - scope: prototype + shared: false feed.reader.atomfeed: class: Zend\Feed\Reader\Extension\Atom\Feed - scope: prototype + shared: false feed.reader.slashentry: class: Zend\Feed\Reader\Extension\Slash\Entry - scope: prototype + shared: false feed.reader.wellformedwebentry: class: Zend\Feed\Reader\Extension\WellFormedWeb\Entry - scope: prototype + shared: false feed.reader.threadentry: class: Zend\Feed\Reader\Extension\Thread\Entry - scope: prototype + shared: false feed.reader.podcastentry: class: Zend\Feed\Reader\Extension\Podcast\Entry - scope: prototype + shared: false feed.reader.podcastfeed: class: Zend\Feed\Reader\Extension\Podcast\Feed - scope: prototype + shared: false # Zend Feed writer plugins. Plugins should be set as prototype scope. feed.writer.atomrendererfeed: class: Zend\Feed\Writer\Extension\Atom\Renderer\Feed - scope: prototype + shared: false feed.writer.contentrendererentry: class: Zend\Feed\Writer\Extension\Content\Renderer\Entry - scope: prototype + shared: false feed.writer.dublincorerendererentry: class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry - scope: prototype + shared: false feed.writer.dublincorerendererfeed: class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed - scope: prototype + shared: false feed.writer.itunesentry: class: Zend\Feed\Writer\Extension\ITunes\Entry - scope: prototype + shared: false feed.writer.itunesfeed: class: Zend\Feed\Writer\Extension\ITunes\Feed - scope: prototype + shared: false feed.writer.itunesrendererentry: class: Zend\Feed\Writer\Extension\ITunes\Renderer\Entry - scope: prototype + shared: false feed.writer.itunesrendererfeed: class: Zend\Feed\Writer\Extension\ITunes\Renderer\Feed - scope: prototype + shared: false feed.writer.slashrendererentry: class: Zend\Feed\Writer\Extension\Slash\Renderer\Entry - scope: prototype + shared: false feed.writer.threadingrendererentry: class: Zend\Feed\Writer\Extension\Threading\Renderer\Entry - scope: prototype + shared: false feed.writer.wellformedwebrendererentry: class: Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry - scope: prototype + shared: false theme.manager: class: Drupal\Core\Theme\ThemeManager arguments: ['@app.root', '@theme.negotiator', '@theme.initialization', '@request_stack', '@module_handler'] diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php index df25ae8..201b3d1 100644 --- a/core/lib/Drupal/Component/DependencyInjection/Container.php +++ b/core/lib/Drupal/Component/DependencyInjection/Container.php @@ -9,6 +9,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\IntrospectableContainerInterface; +use Symfony\Component\DependencyInjection\ResettableContainerInterface; use Symfony\Component\DependencyInjection\ScopeInterface; use Symfony\Component\DependencyInjection\Exception\LogicException; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; @@ -54,7 +55,7 @@ * * @ingroup container */ -class Container implements IntrospectableContainerInterface { +class Container implements IntrospectableContainerInterface, ResettableContainerInterface { /** * The parameters of the container. @@ -182,11 +183,7 @@ public function get($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_IN } catch (\Exception $e) { unset($this->loading[$id]); - - // Remove a potentially shared service that was constructed incompletely. - if (array_key_exists($id, $this->services)) { - unset($this->services[$id]); - } + unset($this->services[$id]); if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalid_behavior) { return; @@ -201,6 +198,17 @@ public function get($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_IN } /** + * {@inheritdoc} + */ + public function reset() { + if (!empty($this->scopedServices)) { + throw new LogicException('Resetting the container is not allowed when a scope is active.'); + } + + $this->services = []; + } + + /** * Creates a service from a service definition. * * @param array $definition @@ -359,6 +367,10 @@ protected function createService(array $definition, $id) { * {@inheritdoc} */ public function set($id, $service, $scope = ContainerInterface::SCOPE_CONTAINER) { + if (!in_array($scope, array('container', 'request')) || ('request' === $scope && 'request' !== $id)) { + @trigger_error('The concept of container scopes is deprecated since version 2.8 and will be removed in 3.0. Omit the third parameter.', E_USER_DEPRECATED); + } + $this->services[$id] = $service; } @@ -585,6 +597,10 @@ protected function getParameterAlternatives($name) { * {@inheritdoc} */ public function enterScope($name) { + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); } @@ -592,6 +608,10 @@ public function enterScope($name) { * {@inheritdoc} */ public function leaveScope($name) { + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); } @@ -599,6 +619,11 @@ public function leaveScope($name) { * {@inheritdoc} */ public function addScope(ScopeInterface $scope) { + + $name = $scope->getName(); + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); } @@ -606,6 +631,10 @@ public function addScope(ScopeInterface $scope) { * {@inheritdoc} */ public function hasScope($name) { + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); } @@ -613,6 +642,8 @@ public function hasScope($name) { * {@inheritdoc} */ public function isScopeActive($name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); } @@ -626,4 +657,11 @@ public function getServiceIds() { return array_keys($this->serviceDefinitions + $this->services); } + /** + * Ensure that cloning doesn't work. + */ + private function __clone() + { + } + } diff --git a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php index 23290b6..663c0d6 100644 --- a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php +++ b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php @@ -252,6 +252,10 @@ protected function getServiceDefinition(Definition $definition) { } } + if ($definition->isShared() === FALSE) { + $service['shared'] = $definition->isShared(); + } + if (($decorated = $definition->getDecoratedService()) !== NULL) { throw new InvalidArgumentException("The 'decorated' definition is not supported by the Drupal 8 run-time container. The Container Builder should have resolved that during the DecoratorServicePass compiler pass."); } diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php index 1edaec3..ff72be4 100644 --- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php +++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php @@ -9,8 +9,12 @@ use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder; use Symfony\Component\DependencyInjection\Container as SymfonyContainer; +use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; +use Symfony\Component\DependencyInjection\Exception\RuntimeException; +use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; +use Symfony\Component\DependencyInjection\Exception\InactiveScopeException; /** * Drupal's dependency injection container builder. @@ -30,6 +34,146 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) { } /** + * Creates a service for a service definition. + * + * Overrides the parent implementation, but just changes one line about + * deprecations, see below. + * + * @param \Symfony\Component\DependencyInjection\Definition $definition + * @param string $id + * @param bool|true $tryProxy + * + * @return mixed|object + */ + public function createService(Definition $definition, $id, $tryProxy = true) + { + if ($definition->isSynthetic()) { + throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id)); + } + + if ($definition->isDeprecated()) { + // @this line is changed. + if ($definition->getDeprecationMessage($id) != ($id . '-no-warning')) { + @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED); + } + } + + if ($tryProxy && $definition->isLazy()) { + $container = $this; + + $proxy = $this + ->getProxyInstantiator() + ->instantiateProxy( + $container, + $definition, + $id, function () use ($definition, $id, $container) { + return $container->createService($definition, $id, false); + } + ); + $this->shareService($definition, $proxy, $id); + + return $proxy; + } + + $parameterBag = $this->getParameterBag(); + + if (null !== $definition->getFile()) { + require_once $parameterBag->resolveValue($definition->getFile()); + } + + $arguments = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments()))); + + if (null !== $factory = $definition->getFactory()) { + if (is_array($factory)) { + $factory = array($this->resolveServices($parameterBag->resolveValue($factory[0])), $factory[1]); + } elseif (!is_string($factory)) { + throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id)); + } + + $service = call_user_func_array($factory, $arguments); + + if (!$definition->isDeprecated() && is_array($factory) && is_string($factory[0])) { + $r = new \ReflectionClass($factory[0]); + + if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) { + @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED); + } + } + } elseif (null !== $definition->getFactoryMethod(false)) { + if (null !== $definition->getFactoryClass(false)) { + $factory = $parameterBag->resolveValue($definition->getFactoryClass(false)); + } elseif (null !== $definition->getFactoryService(false)) { + $factory = $this->get($parameterBag->resolveValue($definition->getFactoryService(false))); + } else { + throw new RuntimeException(sprintf('Cannot create service "%s" from factory method without a factory service or factory class.', $id)); + } + + $service = call_user_func_array(array($factory, $definition->getFactoryMethod(false)), $arguments); + } else { + $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass())); + + $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments); + + if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) { + // Skip deprecation notices for deprecations which opt out. + @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED); + } + } + + if ($tryProxy || !$definition->isLazy()) { + // share only if proxying failed, or if not a proxy + $this->shareService($definition, $service, $id); + } + + foreach ($definition->getMethodCalls() as $call) { + $this->callMethod($service, $call); + } + + $properties = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getProperties()))); + foreach ($properties as $name => $value) { + $service->$name = $value; + } + + if ($callable = $definition->getConfigurator()) { + if (is_array($callable)) { + $callable[0] = $parameterBag->resolveValue($callable[0]); + + if ($callable[0] instanceof Reference) { + $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior()); + } elseif ($callable[0] instanceof Definition) { + $callable[0] = $this->createService($callable[0], null); + } + } + + if (!is_callable($callable)) { + throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service))); + } + + call_user_func($callable, $service); + } + + return $service; + } + + /** + * Direct copy of the parent function. + */ + protected function shareService(Definition $definition, $service, $id) + { + if ($definition->isShared() && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope(false)) { + if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) { + throw new InactiveScopeException($id, $scope); + } + + $this->services[$lowerId = strtolower($id)] = $service; + + if (self::SCOPE_CONTAINER !== $scope) { + $this->scopedServices[$scope][$lowerId] = $service; + } + } + } + + /** * Overrides Symfony\Component\DependencyInjection\ContainerBuilder::set(). * * Drupal's container builder can be used at runtime after compilation, so we diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php index 4c7fea9..1c2bf81 100644 --- a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php +++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php @@ -159,8 +159,15 @@ private function parseDefinition($id, $service, $file) $definition->setClass($service['class']); } + if (isset($service['shared'])) { + $definition->setShared($service['shared']); + } + if (isset($service['scope'])) { - $definition->setScope($service['scope']); + if ('request' !== $id) { + @trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED); + } + $definition->setScope($service['scope'], false); } if (isset($service['synthetic'])) { @@ -183,6 +190,10 @@ private function parseDefinition($id, $service, $file) $definition->setAbstract($service['abstract']); } + if (array_key_exists('deprecated', $service)) { + $definition->setDeprecated(true, $service['deprecated']); + } + if (isset($service['factory'])) { if (is_string($service['factory'])) { if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) { @@ -275,7 +286,30 @@ private function parseDefinition($id, $service, $file) if (isset($service['decorates'])) { $renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null; - $definition->setDecoratedService($service['decorates'], $renameId); + $priority = isset($service['decoration_priority']) ? $service['decoration_priority'] : 0; + $definition->setDecoratedService($service['decorates'], $renameId, $priority); + } + + if (isset($service['autowire'])) { + $definition->setAutowired($service['autowire']); + } + + if (isset($service['autowiring_types'])) { + if (is_string($service['autowiring_types'])) { + $definition->addAutowiringType($service['autowiring_types']); + } else { + if (!is_array($service['autowiring_types'])) { + throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $id, $file)); + } + + foreach ($service['autowiring_types'] as $autowiringType) { + if (!is_string($autowiringType)) { + throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file)); + } + + $definition->addAutowiringType($autowiringType); + } + } } $this->container->setDefinition($id, $definition); diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index ca9a2e4..5a4e57f 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -358,6 +358,10 @@ public function getDefinitionsDataProvider() { 'shared' => FALSE, ) + $base_service_definition; + $service_definitions[] = array( + 'shared' => FALSE, + ) + $base_service_definition; + // Test factory. $service_definitions[] = array( 'factory' => array(new Reference('bar'), 'factoryMethod'), @@ -397,6 +401,7 @@ public function getDefinitionsDataProvider() { $definition->getProperties()->willReturn($service_definition['properties']); $definition->getMethodCalls()->willReturn($service_definition['calls']); $definition->getScope()->willReturn($service_definition['scope']); + $definition->isShared()->willReturn($service_definition['shared']); $definition->getDecoratedService()->willReturn(NULL); $definition->getFactory()->willReturn($service_definition['factory']); $definition->getConfigurator()->willReturn($service_definition['configurator']); diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php index f36d836..3abd4cd 100644 --- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php +++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php @@ -13,6 +13,7 @@ use Symfony\Component\EventDispatcher\Tests\AbstractEventDispatcherTest; use Symfony\Component\EventDispatcher\Tests\CallableClass; use Symfony\Component\EventDispatcher\Tests\TestEventListener; +use Symfony\Component\EventDispatcher\Tests\ContainerAwareEventDispatcherTest as SymfonyContainerAwareEventDispatcherTest; /** * Unit tests for the ContainerAwareEventDispatcher. @@ -27,7 +28,7 @@ * * @group Symfony */ -class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest +class ContainerAwareEventDispatcherTest extends SymfonyContainerAwareEventDispatcherTest { protected function createEventDispatcher() { @@ -175,4 +176,11 @@ public function testRemoveService() $otherService = $container->get('other_listener_service'); $this->assertTrue($otherService->preFooInvoked); } -} + + public function testGetListenerPriority() + { + // Override the parent test as our implementation doesn't define + // getListenerPriority(). + } + + } diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php index 2efb13f..ee13b93 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php @@ -72,7 +72,8 @@ public function providerTestProcess() { // Configure a manual alias for the service, so ensure that it is not // overridden by the default backend. - $container = clone $container; + $container = $this->getMysqlContainer($service); + $container->setParameter('default_backend', 'mysql'); $container->setDefinition('mariadb.service', new Definition($prefix . 'MariaDb')); $container->setAlias('service', new Alias('mariadb.service')); $data[] = array($prefix . 'MariaDb', $container); diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 5e1469e..990cfdc 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -13,9 +13,7 @@ namespace Composer\Autoload; /** - * ClassLoader implements a PSR-0 class loader - * - * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. * * $loader = new \Composer\Autoload\ClassLoader(); * @@ -39,6 +37,8 @@ * * @author Fabien Potencier * @author Jordi Boggiano + * @see http://www.php-fig.org/psr/psr-0/ + * @see http://www.php-fig.org/psr/psr-4/ */ class ClassLoader { diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index fac9eab..bb009b0 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,6 +6,7 @@ $baseDir = dirname($vendorDir); return array( + 'CallbackFilterIterator' => $vendorDir . '/symfony/polyfill-php54/Resources/stubs/CallbackFilterIterator.php', 'Drupal\\Component\\Utility\\Timer' => $baseDir . '/core/lib/Drupal/Component/Utility/Timer.php', 'Drupal\\Component\\Utility\\Unicode' => $baseDir . '/core/lib/Drupal/Component/Utility/Unicode.php', 'Drupal\\Core\\Database\\Database' => $baseDir . '/core/lib/Drupal/Core/Database/Database.php', @@ -410,6 +411,7 @@ 'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php', 'PHP_Token_YIELD' => $vendorDir . '/phpunit/php-token-stream/src/Token.php', 'PHP_Token_YIELD_FROM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php', + 'RecursiveCallbackFilterIterator' => $vendorDir . '/symfony/polyfill-php54/Resources/stubs/RecursiveCallbackFilterIterator.php', 'SebastianBergmann\\Comparator\\ArrayComparator' => $vendorDir . '/sebastian/comparator/src/ArrayComparator.php', 'SebastianBergmann\\Comparator\\Comparator' => $vendorDir . '/sebastian/comparator/src/Comparator.php', 'SebastianBergmann\\Comparator\\ComparisonFailure' => $vendorDir . '/sebastian/comparator/src/ComparisonFailure.php', @@ -437,6 +439,7 @@ 'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php', 'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php', 'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php', + 'SebastianBergmann\\GlobalState\\CodeExporter' => $vendorDir . '/sebastian/global-state/src/CodeExporter.php', 'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/Exception.php', 'SebastianBergmann\\GlobalState\\Restorer' => $vendorDir . '/sebastian/global-state/src/Restorer.php', 'SebastianBergmann\\GlobalState\\RuntimeException' => $vendorDir . '/sebastian/global-state/src/RuntimeException.php', @@ -445,7 +448,7 @@ 'SebastianBergmann\\RecursionContext\\Exception' => $vendorDir . '/sebastian/recursion-context/src/Exception.php', 'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php', 'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php', - 'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php', + 'SessionHandlerInterface' => $vendorDir . '/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php', 'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php', 'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php', 'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 52711f4..c22f4ba 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,8 +6,12 @@ $baseDir = dirname($vendorDir); return array( - $vendorDir . '/guzzlehttp/promises/src/functions_include.php', - $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', - $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', - $baseDir . '/core/lib/Drupal.php', + '3e2471375464aac821502deb0ac64275' => $vendorDir . '/symfony/polyfill-php54/bootstrap.php', + '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', + 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', + 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', + '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', + 'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php', + 'edc6464955a37aa4d5fbf39d40fb6ee7' => $vendorDir . '/symfony/polyfill-php55/bootstrap.php', + '454414594637b9dd94a19af83f56f1a2' => $baseDir . '/core/lib/Drupal.php', ); diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php index bb43043..f32c949 100644 --- a/vendor/composer/autoload_namespaces.php +++ b/vendor/composer/autoload_namespaces.php @@ -17,7 +17,6 @@ 'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'), 'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'), 'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'), - 'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib'), 'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'), 'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'), 'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src'), diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 030a0de..f86cd7f 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -14,6 +14,9 @@ 'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper/src'), 'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'), 'Wikimedia\\Composer\\' => array($vendorDir . '/wikimedia/composer-merge-plugin/src'), + 'Symfony\\Polyfill\\Php55\\' => array($vendorDir . '/symfony/polyfill-php55'), + 'Symfony\\Polyfill\\Php54\\' => array($vendorDir . '/symfony/polyfill-php54'), + 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'), 'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'), 'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'), @@ -43,6 +46,7 @@ 'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core'), 'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component'), 'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'), + 'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'), 'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'), 'Behat\\Mink\\Driver\\' => array($vendorDir . '/behat/mink-browserkit-driver/src', $vendorDir . '/behat/mink-goutte-driver/src'), 'Behat\\Mink\\' => array($vendorDir . '/behat/mink/src'), diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 4bd9987..4303fce 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -41,15 +41,19 @@ public static function getLoader() $loader->register(true); $includeFiles = require __DIR__ . '/autoload_files.php'; - foreach ($includeFiles as $file) { - composerRequireDrupal8($file); + foreach ($includeFiles as $fileIdentifier => $file) { + composerRequireDrupal8($fileIdentifier, $file); } return $loader; } } -function composerRequireDrupal8($file) +function composerRequireDrupal8($fileIdentifier, $file) { - require $file; + if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { + require $file; + + $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b58ef9a..196a243 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,165 +1,5 @@ [ { - "name": "composer/installers", - "version": "v1.0.21", - "version_normalized": "1.0.21.0", - "source": { - "type": "git", - "url": "https://github.com/composer/installers.git", - "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45", - "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45", - "shasum": "" - }, - "replace": { - "roundcube/plugin-installer": "*", - "shama/baton": "*" - }, - "require-dev": { - "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "4.1.*" - }, - "time": "2015-02-18 17:17:01", - "type": "composer-installer", - "extra": { - "class": "Composer\\Installers\\Installer", - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Composer\\Installers\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kyle Robinson Young", - "email": "kyle@dontkry.com", - "homepage": "https://github.com/shama" - } - ], - "description": "A multi-framework Composer library installer", - "homepage": "http://composer.github.com/installers/", - "keywords": [ - "Craft", - "Dolibarr", - "Hurad", - "MODX Evo", - "OXID", - "SMF", - "Thelia", - "WolfCMS", - "agl", - "aimeos", - "annotatecms", - "bitrix", - "cakephp", - "chef", - "codeigniter", - "concrete5", - "croogo", - "dokuwiki", - "drupal", - "elgg", - "fuelphp", - "grav", - "installer", - "joomla", - "kohana", - "laravel", - "lithium", - "magento", - "mako", - "mediawiki", - "modulework", - "moodle", - "phpbb", - "piwik", - "ppi", - "puppet", - "roundcube", - "shopware", - "silverstripe", - "symfony", - "typo3", - "wordpress", - "zend", - "zikula" - ] - }, - { - "name": "composer/semver", - "version": "1.0.0", - "version_normalized": "1.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/d0e1ccc6d44ab318b758d709e19176037da6b1ba", - "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "~2.3" - }, - "time": "2015-09-21 09:42:36", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.1-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com" - }, - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ] - }, - { "name": "doctrine/lexer", "version": "v1.0.1", "version_normalized": "1.0.1.0", @@ -216,37 +56,37 @@ ] }, { - "name": "doctrine/inflector", - "version": "v1.0.1", - "version_normalized": "1.0.1.0", + "name": "doctrine/collections", + "version": "v1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604" + "url": "https://github.com/doctrine/collections.git", + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604", + "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "~4.0" }, - "time": "2014-12-20 21:24:13", + "time": "2015-04-14 22:21:58", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "installation-source": "dist", "autoload": { "psr-0": { - "Doctrine\\Common\\Inflector\\": "lib/" + "Doctrine\\Common\\Collections\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -275,47 +115,48 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "description": "Collections Abstraction library", "homepage": "http://www.doctrine-project.org", "keywords": [ - "inflection", - "pluralize", - "singularize", - "string" + "array", + "collections", + "iterator" ] }, { - "name": "doctrine/collections", - "version": "v1.3.0", - "version_normalized": "1.3.0.0", + "name": "doctrine/annotations", + "version": "v1.2.7", + "version_normalized": "1.2.7.0", "source": { "type": "git", - "url": "https://github.com/doctrine/collections.git", - "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" + "url": "https://github.com/doctrine/annotations.git", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", - "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", "shasum": "" }, "require": { + "doctrine/lexer": "1.*", "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "doctrine/cache": "1.*", + "phpunit/phpunit": "4.*" }, - "time": "2015-04-14 22:21:58", + "time": "2015-08-31 12:32:49", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "installation-source": "dist", "autoload": { "psr-0": { - "Doctrine\\Common\\Collections\\": "lib/" + "Doctrine\\Common\\Annotations\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -344,51 +185,51 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Collections Abstraction library", + "description": "Docblock Annotations Parser", "homepage": "http://www.doctrine-project.org", "keywords": [ - "array", - "collections", - "iterator" + "annotations", + "docblock", + "parser" ] }, { - "name": "doctrine/cache", - "version": "v1.4.2", - "version_normalized": "1.4.2.0", + "name": "doctrine/common", + "version": "v2.5.1", + "version_normalized": "2.5.1.0", "source": { "type": "git", - "url": "https://github.com/doctrine/cache.git", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" + "url": "https://github.com/doctrine/common.git", + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", + "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", "shasum": "" }, "require": { + "doctrine/annotations": "1.*", + "doctrine/cache": "1.*", + "doctrine/collections": "1.*", + "doctrine/inflector": "1.*", + "doctrine/lexer": "1.*", "php": ">=5.3.2" }, - "conflict": { - "doctrine/common": ">2.2,<2.4" - }, "require-dev": { - "phpunit/phpunit": ">=3.7", - "predis/predis": "~1.0", - "satooshi/php-coveralls": "~0.6" + "phpunit/phpunit": "~3.7" }, - "time": "2015-08-31 12:36:41", + "time": "2015-08-31 13:00:22", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "2.6.x-dev" } }, "installation-source": "dist", "autoload": { "psr-0": { - "Doctrine\\Common\\Cache\\": "lib/" + "Doctrine\\Common\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -417,120 +258,109 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Caching library offering an object-oriented API for many cache backends", + "description": "Common Library for Doctrine projects", "homepage": "http://www.doctrine-project.org", "keywords": [ - "cache", - "caching" + "annotations", + "collections", + "eventmanager", + "persistence", + "spl" ] }, { - "name": "doctrine/annotations", - "version": "v1.2.7", - "version_normalized": "1.2.7.0", + "name": "easyrdf/easyrdf", + "version": "0.9.1", + "version_normalized": "0.9.1.0", "source": { "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" + "url": "https://github.com/njh/easyrdf.git", + "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566", + "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566", "shasum": "" }, "require": { - "doctrine/lexer": "1.*", - "php": ">=5.3.2" + "ext-mbstring": "*", + "ext-pcre": "*", + "php": ">=5.2.8" }, "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "~3.5", + "sami/sami": "~1.4", + "squizlabs/php_codesniffer": "~1.4.3" }, - "time": "2015-08-31 12:32:49", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } + "suggest": { + "ml/json-ld": "~1.0" }, + "time": "2015-02-27 09:45:49", + "type": "library", "installation-source": "dist", "autoload": { "psr-0": { - "Doctrine\\Common\\Annotations\\": "lib/" + "EasyRdf_": "lib/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" + "name": "Nicholas Humfrey", + "email": "njh@aelius.com", + "homepage": "http://www.aelius.com/njh/", + "role": "Developer" }, { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Alexey Zakhlestin", + "email": "indeyets@gmail.com", + "role": "Developer" } ], - "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", + "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.", + "homepage": "http://www.easyrdf.org/", "keywords": [ - "annotations", - "docblock", - "parser" + "Linked Data", + "RDF", + "Semantic Web", + "Turtle", + "rdfa", + "sparql" ] }, { - "name": "doctrine/common", - "version": "v2.5.1", - "version_normalized": "2.5.1.0", + "name": "psr/http-message", + "version": "1.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/common.git", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" + "url": "https://github.com/php-fig/http-message.git", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", "shasum": "" }, "require": { - "doctrine/annotations": "1.*", - "doctrine/cache": "1.*", - "doctrine/collections": "1.*", - "doctrine/inflector": "1.*", - "doctrine/lexer": "1.*", - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~3.7" + "php": ">=5.3.0" }, - "time": "2015-08-31 13:00:22", + "time": "2015-05-04 20:22:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6.x-dev" + "dev-master": "1.0.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "Doctrine\\Common\\": "lib/" + "psr-4": { + "Psr\\Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -539,134 +369,108 @@ ], "authors": [ { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Common Library for Doctrine projects", - "homepage": "http://www.doctrine-project.org", + "description": "Common interface for HTTP messages", "keywords": [ - "annotations", - "collections", - "eventmanager", - "persistence", - "spl" + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" ] }, { - "name": "easyrdf/easyrdf", - "version": "0.9.1", - "version_normalized": "0.9.1.0", + "name": "masterminds/html5", + "version": "2.1.2", + "version_normalized": "2.1.2.0", "source": { "type": "git", - "url": "https://github.com/njh/easyrdf.git", - "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566" + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566", - "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/8f782e0f01a6e33a319bdc8f6de9cfd6569979a4", + "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4", "shasum": "" }, "require": { - "ext-mbstring": "*", - "ext-pcre": "*", - "php": ">=5.2.8" + "ext-libxml": "*", + "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "~3.5", - "sami/sami": "~1.4", - "squizlabs/php_codesniffer": "~1.4.3" - }, - "suggest": { - "ml/json-ld": "~1.0" + "phpunit/phpunit": "4.*", + "sami/sami": "~2.0", + "satooshi/php-coveralls": "0.6.*" }, - "time": "2015-02-27 09:45:49", + "time": "2015-06-07 08:43:18", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, "installation-source": "dist", "autoload": { - "psr-0": { - "EasyRdf_": "lib/" + "psr-4": { + "Masterminds\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Nicholas Humfrey", - "email": "njh@aelius.com", - "homepage": "http://www.aelius.com/njh/", - "role": "Developer" + "name": "Matt Butcher", + "email": "technosophos@gmail.com" }, { - "name": "Alexey Zakhlestin", - "email": "indeyets@gmail.com", - "role": "Developer" + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" } ], - "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.", - "homepage": "http://www.easyrdf.org/", + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", "keywords": [ - "Linked Data", - "RDF", - "Semantic Web", - "Turtle", - "rdfa", - "sparql" + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" ] }, { - "name": "egulias/email-validator", - "version": "1.2.9", - "version_normalized": "1.2.9.0", + "name": "psr/log", + "version": "1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/egulias/EmailValidator.git", - "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1" + "url": "https://github.com/php-fig/log.git", + "reference": "1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1", - "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", + "reference": "1.0.0", "shasum": "" }, - "require": { - "doctrine/lexer": "~1.0,>=1.0.1", - "php": ">= 5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4", - "satooshi/php-coveralls": "dev-master" - }, - "time": "2015-06-22 21:07:51", + "time": "2012-12-21 11:40:51", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "installation-source": "dist", "autoload": { "psr-0": { - "Egulias\\": "src/" + "Psr\\Log\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -675,41 +479,41 @@ ], "authors": [ { - "name": "Eduardo Gulias Davis" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "A library for validating emails", - "homepage": "https://github.com/egulias/EmailValidator", + "description": "Common interface for logging libraries", "keywords": [ - "email", - "emailvalidation", - "emailvalidator", - "validation", - "validator" + "log", + "psr", + "psr-3" ] }, { - "name": "guzzlehttp/promises", - "version": "1.0.2", - "version_normalized": "1.0.2.0", + "name": "stack/builder", + "version": "v1.0.3", + "version_normalized": "1.0.3.0", "source": { "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "97fe7210def29451ec74923b27e552238defd75a" + "url": "https://github.com/stackphp/builder.git", + "reference": "c1f8a4693b55c563405024f708a76ef576c3b276" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/97fe7210def29451ec74923b27e552238defd75a", - "reference": "97fe7210def29451ec74923b27e552238defd75a", + "url": "https://api.github.com/repos/stackphp/builder/zipball/c1f8a4693b55c563405024f708a76ef576c3b276", + "reference": "c1f8a4693b55c563405024f708a76ef576c3b276", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.3.0", + "symfony/http-foundation": "~2.1", + "symfony/http-kernel": "~2.1" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "silex/silex": "~1.0" }, - "time": "2015-08-15 19:37:21", + "time": "2014-11-23 20:37:11", "type": "library", "extra": { "branch-alias": { @@ -718,58 +522,65 @@ }, "installation-source": "dist", "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, + "psr-0": { + "Stack": "src" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" } ], - "description": "Guzzle promises library", + "description": "Builder for stack middlewares based on HttpKernelInterface.", "keywords": [ - "promise" + "stack" ] }, { - "name": "psr/http-message", - "version": "1.0", - "version_normalized": "1.0.0.0", + "name": "symfony-cmf/routing", + "version": "1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + "url": "https://github.com/symfony-cmf/Routing.git", + "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/8e87981d72c6930a27585dcd3119f3199f6cb2a6", + "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.3.3", + "psr/log": "~1.0", + "symfony/http-kernel": "~2.2", + "symfony/routing": "~2.2" }, - "time": "2015-05-04 20:22:00", + "require-dev": { + "symfony/config": "~2.2", + "symfony/dependency-injection": "~2.0@stable", + "symfony/event-dispatcher": "~2.1" + }, + "suggest": { + "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1" + }, + "time": "2014-10-20 20:55:17", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "Symfony\\Cmf\\Component\\Routing\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -778,60 +589,50 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/Routing/contributors" } ], - "description": "Common interface for HTTP messages", + "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", + "homepage": "http://cmf.symfony.com", "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" + "database", + "routing" ] }, { - "name": "guzzlehttp/psr7", - "version": "1.2.0", - "version_normalized": "1.2.0.0", + "name": "symfony/psr-http-message-bridge", + "version": "v0.2", + "version_normalized": "0.2.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e" + "url": "https://github.com/symfony/psr-http-message-bridge.git", + "reference": "dc7e308e1dc2898a46776e2221a643cb08315453" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/4ef919b0cf3b1989523138b60163bbcb7ba1ff7e", - "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453", + "reference": "dc7e308e1dc2898a46776e2221a643cb08315453", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" + "php": ">=5.3.3", + "psr/http-message": "~1.0", + "symfony/http-foundation": "~2.3|~3.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "symfony/phpunit-bridge": "~2.7|~3.0" }, - "time": "2015-08-15 19:32:36", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } + "suggest": { + "zendframework/zend-diactoros": "To use the Zend Diactoros factory" }, + "time": "2015-05-29 17:57:12", + "type": "symfony-bridge", "installation-source": "dist", "autoload": { "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] + "Symfony\\Bridge\\PsrHttpMessage\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -839,160 +640,165 @@ ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], - "description": "PSR-7 message implementation", + "description": "PSR HTTP message bridge", + "homepage": "http://symfony.com", "keywords": [ "http", - "message", - "stream", - "uri" + "http-message", + "psr-7" ] }, { - "name": "masterminds/html5", - "version": "2.1.2", - "version_normalized": "2.1.2.0", + "name": "zendframework/zend-hydrator", + "version": "1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/Masterminds/html5-php.git", - "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4" + "url": "https://github.com/zendframework/zend-hydrator.git", + "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/8f782e0f01a6e33a319bdc8f6de9cfd6569979a4", - "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4", + "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f", + "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f", "shasum": "" }, "require": { - "ext-libxml": "*", - "php": ">=5.3.0" + "php": ">=5.5", + "zendframework/zend-stdlib": "^2.5.1" }, "require-dev": { - "phpunit/phpunit": "4.*", - "sami/sami": "~2.0", - "satooshi/php-coveralls": "0.6.*" + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.0@dev", + "zendframework/zend-eventmanager": "^2.5.1", + "zendframework/zend-filter": "^2.5.1", + "zendframework/zend-inputfilter": "^2.5.1", + "zendframework/zend-serializer": "^2.5.1", + "zendframework/zend-servicemanager": "^2.5.1" }, - "time": "2015-06-07 08:43:18", + "suggest": { + "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage", + "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage", + "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy", + "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage" + }, + "time": "2015-09-17 14:06:43", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "1.0-dev", + "dev-develop": "1.1-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Masterminds\\": "src" + "Zend\\Hydrator\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "Matt Butcher", - "email": "technosophos@gmail.com" - }, - { - "name": "Asmir Mustafic", - "email": "goetas@gmail.com" - }, - { - "name": "Matt Farina", - "email": "matt@mattfarina.com" - } + "BSD-3-Clause" ], - "description": "An HTML5 parser and serializer.", - "homepage": "http://masterminds.github.io/html5-php", + "homepage": "https://github.com/zendframework/zend-hydrator", "keywords": [ - "HTML5", - "dom", - "html", - "parser", - "querypath", - "serializer", - "xml" + "hydrator", + "zf2" ] }, { - "name": "psr/log", - "version": "1.0.0", - "version_normalized": "1.0.0.0", + "name": "zendframework/zend-escaper", + "version": "2.5.1", + "version_normalized": "2.5.1.0", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "1.0.0" + "url": "https://github.com/zendframework/zend-escaper.git", + "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "1.0.0", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", + "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", "shasum": "" }, - "time": "2012-12-21 11:40:51", + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "time": "2015-06-03 14:05:37", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, "installation-source": "dist", "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Zend\\Escaper\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } + "BSD-3-Clause" ], - "description": "Common interface for logging libraries", + "homepage": "https://github.com/zendframework/zend-escaper", "keywords": [ - "log", - "psr", - "psr-3" + "escaper", + "zf2" ] }, { - "name": "stack/builder", - "version": "v1.0.3", - "version_normalized": "1.0.3.0", + "name": "behat/mink", + "version": "v1.7.0", + "version_normalized": "1.7.0.0", "source": { "type": "git", - "url": "https://github.com/stackphp/builder.git", - "reference": "c1f8a4693b55c563405024f708a76ef576c3b276" + "url": "https://github.com/minkphp/Mink.git", + "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stackphp/builder/zipball/c1f8a4693b55c563405024f708a76ef576c3b276", - "reference": "c1f8a4693b55c563405024f708a76ef576c3b276", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf", + "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/http-foundation": "~2.1", - "symfony/http-kernel": "~2.1" + "php": ">=5.3.1", + "symfony/css-selector": "~2.1" }, "require-dev": { - "silex/silex": "~1.0" + "symfony/phpunit-bridge": "~2.7" }, - "time": "2014-11-23 20:37:11", - "type": "library", - "extra": { + "suggest": { + "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", + "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation", + "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)", + "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)" + }, + "time": "2015-09-20 20:24:03", + "type": "library", + "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.7.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "Stack": "src" + "psr-4": { + "Behat\\Mink\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1001,55 +807,55 @@ ], "authors": [ { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" } ], - "description": "Builder for stack middlewares based on HttpKernelInterface.", + "description": "Browser controller/emulator abstraction for PHP", + "homepage": "http://mink.behat.org/", "keywords": [ - "stack" + "browser", + "testing", + "web" ] }, { - "name": "symfony-cmf/routing", - "version": "1.3.0", + "name": "behat/mink-browserkit-driver", + "version": "v1.3.0", "version_normalized": "1.3.0.0", "source": { "type": "git", - "url": "https://github.com/symfony-cmf/Routing.git", - "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6" + "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", + "reference": "da47df1593dac132f04d24e7277ef40d33d9f201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/8e87981d72c6930a27585dcd3119f3199f6cb2a6", - "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201", + "reference": "da47df1593dac132f04d24e7277ef40d33d9f201", "shasum": "" }, "require": { - "php": ">=5.3.3", - "psr/log": "~1.0", - "symfony/http-kernel": "~2.2", - "symfony/routing": "~2.2" + "behat/mink": "~1.7@dev", + "php": ">=5.3.6", + "symfony/browser-kit": "~2.3", + "symfony/dom-crawler": "~2.3" }, "require-dev": { - "symfony/config": "~2.2", - "symfony/dependency-injection": "~2.0@stable", - "symfony/event-dispatcher": "~2.1" - }, - "suggest": { - "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1" + "silex/silex": "~1.2", + "symfony/phpunit-bridge": "~2.7" }, - "time": "2014-10-20 20:55:17", - "type": "library", + "time": "2015-09-21 20:56:13", + "type": "mink-driver", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.3.x-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Cmf\\Component\\Routing\\": "" + "Behat\\Mink\\Driver\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1058,49 +864,55 @@ ], "authors": [ { - "name": "Symfony CMF Community", - "homepage": "https://github.com/symfony-cmf/Routing/contributors" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" } ], - "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", - "homepage": "http://cmf.symfony.com", + "description": "Symfony2 BrowserKit driver for Mink framework", + "homepage": "http://mink.behat.org/", "keywords": [ - "database", - "routing" + "Mink", + "Symfony2", + "browser", + "testing" ] }, { - "name": "symfony/psr-http-message-bridge", - "version": "v0.2", - "version_normalized": "0.2.0.0", + "name": "behat/mink-goutte-driver", + "version": "v1.2.0", + "version_normalized": "1.2.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "dc7e308e1dc2898a46776e2221a643cb08315453" + "url": "https://github.com/minkphp/MinkGoutteDriver.git", + "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453", - "reference": "dc7e308e1dc2898a46776e2221a643cb08315453", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f", + "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f", "shasum": "" }, "require": { - "php": ">=5.3.3", - "psr/http-message": "~1.0", - "symfony/http-foundation": "~2.3|~3.0" + "behat/mink": "~1.6@dev", + "behat/mink-browserkit-driver": "~1.2@dev", + "fabpot/goutte": "~1.0.4|~2.0|~3.1", + "php": ">=5.3.1" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0" + "symfony/phpunit-bridge": "~2.7" }, - "suggest": { - "zendframework/zend-diactoros": "To use the Zend Diactoros factory" + "time": "2015-09-21 21:31:11", + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } }, - "time": "2015-05-29 17:57:12", - "type": "symfony-bridge", "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Bridge\\PsrHttpMessage\\": "" + "Behat\\Mink\\Driver\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1109,715 +921,725 @@ ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" } ], - "description": "PSR HTTP message bridge", - "homepage": "http://symfony.com", + "description": "Goutte driver for Mink framework", + "homepage": "http://mink.behat.org/", "keywords": [ - "http", - "http-message", - "psr-7" + "browser", + "goutte", + "headless", + "testing" ] }, { - "name": "zendframework/zend-diactoros", - "version": "1.1.3", - "version_normalized": "1.1.3.0", + "name": "mikey179/vfsStream", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181" + "url": "https://github.com/mikey179/vfsStream.git", + "reference": "73bcb605b741a7d5044b47592338c633788b0eb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181", - "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181", + "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/73bcb605b741a7d5044b47592338c633788b0eb7", + "reference": "73bcb605b741a7d5044b47592338c633788b0eb7", "shasum": "" }, "require": { - "php": ">=5.4", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "~1.0.0" + "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "~4.6", - "squizlabs/php_codesniffer": "^2.3.1" + "phpunit/phpunit": "~4.5" }, - "time": "2015-08-10 20:04:20", + "time": "2015-10-06 16:59:57", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.6.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Zend\\Diactoros\\": "src/" + "psr-0": { + "org\\bovigo\\vfs\\": "src/main/php" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-2-Clause" + "BSD-3-Clause" ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ] + "authors": [ + { + "name": "Frank Kleine", + "homepage": "http://frankkleine.de/", + "role": "Developer" + } + ], + "description": "Virtual file system to mock the real file system in unit tests.", + "homepage": "http://vfs.bovigo.org/" }, { - "name": "zendframework/zend-stdlib", - "version": "2.7.3", - "version_normalized": "2.7.3.0", + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.4", + "version_normalized": "2.0.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc" + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8ac0c77ff567fcf49b58689ee3bfa7595be102bc", - "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-hydrator": "~1.0" + "php": ">=5.3.3" }, "require-dev": { - "athletic/athletic": "~0.1", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" + "phpunit/phpunit": "~4.0" }, "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, - "time": "2015-09-25 04:06:33", + "time": "2015-02-03 12:10:50", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.0.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" + "psr-0": { + "phpDocumentor": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } ] }, { - "name": "zendframework/zend-hydrator", - "version": "1.0.0", - "version_normalized": "1.0.0.0", + "name": "phpunit/php-token-stream", + "version": "1.4.8", + "version_normalized": "1.4.8.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f" + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f", - "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-stdlib": "^2.5.1" + "ext-tokenizer": "*", + "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0@dev", - "zendframework/zend-eventmanager": "^2.5.1", - "zendframework/zend-filter": "^2.5.1", - "zendframework/zend-inputfilter": "^2.5.1", - "zendframework/zend-serializer": "^2.5.1", - "zendframework/zend-servicemanager": "^2.5.1" + "phpunit/phpunit": "~4.2" }, - "suggest": { - "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage", - "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage", - "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy", - "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage" - }, - "time": "2015-09-17 14:06:43", + "time": "2015-09-15 10:49:45", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.4-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Zend\\Hydrator\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-hydrator", + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", "keywords": [ - "hydrator", - "zf2" + "tokenizer" ] }, { - "name": "zendframework/zend-escaper", - "version": "2.5.1", - "version_normalized": "2.5.1.0", + "name": "sebastian/version", + "version": "1.0.6", + "version_normalized": "1.0.6.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73" + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", - "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", "shasum": "" }, - "require": { - "php": ">=5.3.23" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "time": "2015-06-03 14:05:37", + "time": "2015-06-21 13:59:46", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, "installation-source": "dist", "autoload": { - "psr-4": { - "Zend\\Escaper\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-escaper", - "keywords": [ - "escaper", - "zf2" - ] + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version" }, { - "name": "zendframework/zend-feed", - "version": "2.5.2", - "version_normalized": "2.5.2.0", + "name": "sebastian/recursion-context", + "version": "1.0.1", + "version_normalized": "1.0.1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-feed.git", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54" + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "994d4a811bafe801fb06dccbee797863ba2792ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba", + "reference": "994d4a811bafe801fb06dccbee797863ba2792ba", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-escaper": "~2.5", - "zendframework/zend-stdlib": "~2.5" + "php": ">=5.3.3" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-db": "~2.5", - "zendframework/zend-http": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-validator": "~2.5" - }, - "suggest": { - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-db": "Zend\\Db component", - "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" + "phpunit/phpunit": "~4.4" }, - "time": "2015-08-04 21:39:18", + "time": "2015-06-21 08:04:50", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "1.0.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Zend\\Feed\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides functionality for consuming RSS and Atom feeds", - "homepage": "https://github.com/zendframework/zend-feed", - "keywords": [ - "feed", - "zf2" - ] + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context" }, { - "name": "guzzlehttp/guzzle", - "version": "6.1.0", - "version_normalized": "6.1.0.0", + "name": "sebastian/exporter", + "version": "1.2.1", + "version_normalized": "1.2.1.0", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81" + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd14b4d0b8f2389eaf37c5458608c7cb793a81", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e", "shasum": "" }, "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" }, "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" + "phpunit/phpunit": "~4.4" }, - "time": "2015-09-08 17:36:26", + "time": "2015-06-21 07:55:53", "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "1.2.x-dev" } }, "installation-source": "dist", "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" + "export", + "exporter" ] }, { - "name": "fabpot/goutte", - "version": "v3.1.1", - "version_normalized": "3.1.1.0", + "name": "sebastian/environment", + "version": "1.3.2", + "version_normalized": "1.3.2.0", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc" + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/751a3dc5c4d86ec3e97c9f27133ef9694d9243cc", - "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", + "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.0", - "php": ">=5.5.0", - "symfony/browser-kit": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1" + "php": ">=5.3.3" }, - "time": "2015-08-29 16:16:56", - "type": "application", + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "time": "2015-08-03 06:14:51", + "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "1.3.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Goutte\\": "Goutte" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "A simple PHP Web Scraper", - "homepage": "https://github.com/FriendsOfPHP/Goutte", + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", "keywords": [ - "scraper" + "Xdebug", + "environment", + "hhvm" ] }, { - "name": "behat/mink", - "version": "v1.7.0", - "version_normalized": "1.7.0.0", + "name": "sebastian/diff", + "version": "1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", - "url": "https://github.com/minkphp/Mink.git", - "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf" + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf", - "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", "shasum": "" }, "require": { - "php": ">=5.3.1", - "symfony/css-selector": "~2.1" + "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7" + "phpunit/phpunit": "~4.2" }, - "suggest": { - "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", - "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation", - "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)", - "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)" - }, - "time": "2015-09-20 20:24:03", + "time": "2015-02-22 15:13:53", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.3-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Behat\\Mink\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Browser controller/emulator abstraction for PHP", - "homepage": "http://mink.behat.org/", + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", "keywords": [ - "browser", - "testing", - "web" + "diff" ] }, { - "name": "behat/mink-browserkit-driver", - "version": "v1.3.0", - "version_normalized": "1.3.0.0", + "name": "sebastian/comparator", + "version": "1.2.0", + "version_normalized": "1.2.0.0", "source": { "type": "git", - "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "da47df1593dac132f04d24e7277ef40d33d9f201" + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201", - "reference": "da47df1593dac132f04d24e7277ef40d33d9f201", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", "shasum": "" }, "require": { - "behat/mink": "~1.7@dev", - "php": ">=5.3.6", - "symfony/browser-kit": "~2.3", - "symfony/dom-crawler": "~2.3" + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "silex/silex": "~1.2", - "symfony/phpunit-bridge": "~2.7" + "phpunit/phpunit": "~4.4" }, - "time": "2015-09-21 20:56:13", - "type": "mink-driver", + "time": "2015-07-26 15:48:44", + "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.2.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Behat\\Mink\\Driver\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Symfony2 BrowserKit driver for Mink framework", - "homepage": "http://mink.behat.org/", + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", "keywords": [ - "Mink", - "Symfony2", - "browser", - "testing" + "comparator", + "compare", + "equality" ] }, { - "name": "behat/mink-goutte-driver", - "version": "v1.2.0", - "version_normalized": "1.2.0.0", + "name": "phpunit/php-text-template", + "version": "1.2.1", + "version_normalized": "1.2.1.0", "source": { "type": "git", - "url": "https://github.com/minkphp/MinkGoutteDriver.git", - "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f", - "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { - "behat/mink": "~1.6@dev", - "behat/mink-browserkit-driver": "~1.2@dev", - "fabpot/goutte": "~1.0.4|~2.0|~3.1", - "php": ">=5.3.1" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, - "time": "2015-09-21 21:31:11", - "type": "mink-driver", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } + "php": ">=5.3.3" }, + "time": "2015-06-21 13:50:34", + "type": "library", "installation-source": "dist", "autoload": { - "psr-4": { - "Behat\\Mink\\Driver\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Goutte driver for Mink framework", - "homepage": "http://mink.behat.org/", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "browser", - "goutte", - "headless", - "testing" + "template" ] }, { - "name": "mikey179/vfsStream", - "version": "v1.6.0", - "version_normalized": "1.6.0.0", + "name": "doctrine/instantiator", + "version": "1.0.5", + "version_normalized": "1.0.5.0", "source": { "type": "git", - "url": "https://github.com/mikey179/vfsStream.git", - "reference": "73bcb605b741a7d5044b47592338c633788b0eb7" + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/73bcb605b741a7d5044b47592338c633788b0eb7", - "reference": "73bcb605b741a7d5044b47592338c633788b0eb7", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { - "phpunit/phpunit": "~4.5" + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" }, - "time": "2015-10-06 16:59:57", + "time": "2015-06-14 21:17:01", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.0.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "org\\bovigo\\vfs\\": "src/main/php" + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Frank Kleine", - "homepage": "http://frankkleine.de/", - "role": "Developer" + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" } ], - "description": "Virtual file system to mock the real file system in unit tests.", - "homepage": "http://vfs.bovigo.org/" + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ] }, { - "name": "phpdocumentor/reflection-docblock", - "version": "2.0.4", - "version_normalized": "2.0.4.0", + "name": "phpunit/phpunit-mock-objects", + "version": "2.3.8", + "version_normalized": "2.3.8.0", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", "shasum": "" }, "require": { - "php": ">=5.3.3" + "doctrine/instantiator": "^1.0.2", + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.4" }, "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" + "ext-soap": "*" }, - "time": "2015-02-03 12:10:50", + "time": "2015-10-02 06:51:40", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.3.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/" - ] - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" ] }, { - "name": "phpunit/php-token-stream", - "version": "1.4.8", - "version_normalized": "1.4.8.0", + "name": "phpunit/php-timer", + "version": "1.0.7", + "version_normalized": "1.0.7.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", "shasum": "" }, "require": { - "ext-tokenizer": "*", "php": ">=5.3.3" }, - "require-dev": { - "phpunit/phpunit": "~4.2" + "time": "2015-06-21 08:01:12", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] }, - "time": "2015-09-15 10:49:45", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ] + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.1", + "version_normalized": "1.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2015-06-21 13:08:43", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.4.x-dev" } }, "installation-source": "dist", @@ -1833,32 +1655,56 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ - "tokenizer" + "filesystem", + "iterator" ] }, { - "name": "sebastian/version", - "version": "1.0.6", - "version_normalized": "1.0.6.0", + "name": "phpunit/php-code-coverage", + "version": "2.2.4", + "version_normalized": "2.2.4.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "shasum": "" }, - "time": "2015-06-21 13:59:46", + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0" + }, + "require-dev": { + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" + }, + "time": "2015-10-06 15:47:00", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, "installation-source": "dist", "autoload": { "classmap": [ @@ -1872,38 +1718,435 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", + "email": "sb@sebastian-bergmann.de", "role": "lead" } ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version" + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ] + }, + { + "name": "phpspec/prophecy", + "version": "v1.5.0", + "version_normalized": "1.5.0.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1" + }, + "require-dev": { + "phpspec/phpspec": "~2.0" + }, + "time": "2015-08-13 10:07:40", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ] + }, + { + "name": "jcalderonzumba/gastonjs", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/jcalderonzumba/gastonjs.git", + "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/5e231b4df98275c404e1371fc5fadd34f6a121ad", + "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~5.0|~6.0", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "silex/silex": "~1.2", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.1" + }, + "time": "2015-10-07 11:40:41", + "type": "phantomjs-api", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-4": { + "Zumba\\GastonJS\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Juan Francisco Calderón Zumba", + "email": "juanfcz@gmail.com", + "homepage": "http://github.com/jcalderonzumba" + } + ], + "description": "PhantomJS API based server for webpage automation", + "homepage": "https://github.com/jcalderonzumba/gastonjs", + "keywords": [ + "api", + "automation", + "browser", + "headless", + "phantomjs" + ] + }, + { + "name": "jcalderonzumba/mink-phantomjs-driver", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git", + "reference": "10d7c48c9a4129463052321b52450d98983c4332" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/10d7c48c9a4129463052321b52450d98983c4332", + "reference": "10d7c48c9a4129463052321b52450d98983c4332", + "shasum": "" + }, + "require": { + "behat/mink": "~1.6", + "jcalderonzumba/gastonjs": "~1.0", + "php": ">=5.4", + "twig/twig": "~1.8" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "silex/silex": "~1.2", + "symfony/css-selector": "~2.1", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.3" + }, + "time": "2015-10-05 18:24:44", + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "0.4.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-4": { + "Zumba\\Mink\\Driver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Juan Francisco Calderón Zumba", + "email": "juanfcz@gmail.com", + "homepage": "http://github.com/jcalderonzumba" + } + ], + "description": "PhantomJS driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "ajax", + "browser", + "headless", + "javascript", + "phantomjs", + "testing" + ] + }, + { + "name": "twig/twig", + "version": "v1.23.1", + "version_normalized": "1.23.1.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "shasum": "" + }, + "require": { + "php": ">=5.2.7" + }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" + }, + "time": "2015-11-05 12:49:06", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.23-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", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + }, + { + "name": "Twig Team", + "homepage": "http://twig.sensiolabs.org/contributors", + "role": "Contributors" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] + }, + { + "name": "wikimedia/composer-merge-plugin", + "version": "v1.3.0", + "version_normalized": "1.3.0.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/composer-merge-plugin.git", + "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", + "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": ">=5.3.2" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "jakub-onderka/php-parallel-lint": "~0.8", + "phpunit/phpunit": "~4.8|~5.0", + "squizlabs/php_codesniffer": "~2.1.0" + }, + "time": "2015-11-06 20:31:16", + "type": "composer-plugin", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + }, + "class": "Wikimedia\\Composer\\MergePlugin" + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Wikimedia\\Composer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bryan Davis", + "email": "bd808@wikimedia.org" + } + ], + "description": "Composer plugin to merge multiple composer.json files" + }, + { + "name": "composer/installers", + "version": "v1.0.22", + "version_normalized": "1.0.22.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "shasum": "" + }, + "require": { + "composer-plugin-api": "1.0.0" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" + }, + "time": "2015-10-29 23:28:48", + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "Craft", + "Dolibarr", + "Hurad", + "MODX Evo", + "OXID", + "SMF", + "Thelia", + "WolfCMS", + "agl", + "aimeos", + "annotatecms", + "bitrix", + "cakephp", + "chef", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "elgg", + "fuelphp", + "grav", + "installer", + "joomla", + "kohana", + "laravel", + "lithium", + "magento", + "mako", + "mediawiki", + "modulework", + "moodle", + "phpbb", + "piwik", + "ppi", + "puppet", + "roundcube", + "shopware", + "silverstripe", + "symfony", + "typo3", + "wordpress", + "zend", + "zikula" + ] }, { - "name": "sebastian/global-state", - "version": "1.0.0", + "name": "symfony/polyfill-mbstring", + "version": "v1.0.0", "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "suggest": { - "ext-uopz": "*" - }, - "time": "2014-10-06 09:23:50", + "time": "2015-11-04 20:28:58", "type": "library", "extra": { "branch-alias": { @@ -1912,452 +2155,418 @@ }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", "keywords": [ - "global state" + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" ] }, { - "name": "sebastian/recursion-context", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "name": "symfony/polyfill-php54", + "version": "v1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba" + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "time": "2015-06-21 08:04:50", + "time": "2015-11-04 20:28:58", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" } }, "installation-source": "dist", "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], "classmap": [ - "src/" + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context" + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ] }, { - "name": "sebastian/exporter", - "version": "1.2.1", - "version_normalized": "1.2.1.0", + "name": "ircmaxell/password-compat", + "version": "v1.0.4", + "version_normalized": "1.0.4.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", "shasum": "" }, - "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" - }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "4.*" }, - "time": "2015-06-21 07:55:53", + "time": "2014-11-20 16:49:30", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" + "files": [ + "lib/password.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" } ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", "keywords": [ - "export", - "exporter" + "hashing", + "password" ] }, { - "name": "sebastian/environment", - "version": "1.3.2", - "version_normalized": "1.3.2.0", + "name": "symfony/polyfill-php55", + "version": "v1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", "shasum": "" }, "require": { + "ircmaxell/password-compat": "~1.0", "php": ">=5.3.3" }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "time": "2015-08-03 06:14:51", + "time": "2015-11-04 20:28:58", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.0-dev" } }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", + "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "homepage": "https://symfony.com", "keywords": [ - "Xdebug", - "environment", - "hhvm" + "compatibility", + "polyfill", + "portable", + "shim" ] }, { - "name": "sebastian/diff", - "version": "1.3.0", - "version_normalized": "1.3.0.0", + "name": "egulias/email-validator", + "version": "1.2.11", + "version_normalized": "1.2.11.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "04c6cdf9871140b80947c87db7770c0dd9c75c7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/04c6cdf9871140b80947c87db7770c0dd9c75c7c", + "reference": "04c6cdf9871140b80947c87db7770c0dd9c75c7c", "shasum": "" }, "require": { - "php": ">=5.3.3" + "doctrine/lexer": "~1.0,>=1.0.1", + "php": ">= 5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.4", + "satooshi/php-coveralls": "dev-master" }, - "time": "2015-02-22 15:13:53", + "time": "2015-11-11 03:28:32", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "2.0.x-dev" } }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "Egulias\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Eduardo Gulias Davis" } ], - "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "description": "A library for validating emails", + "homepage": "https://github.com/egulias/EmailValidator", "keywords": [ - "diff" + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" ] }, { - "name": "sebastian/comparator", + "name": "composer/semver", "version": "1.2.0", "version_normalized": "1.2.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + "url": "https://github.com/composer/semver.git", + "reference": "0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "url": "https://api.github.com/repos/composer/semver/zipball/0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3", + "reference": "0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2" + "php": "^5.3.2 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" }, - "time": "2015-07-26 15:48:44", + "time": "2015-11-10 11:17:42", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ] - }, - { - "name": "phpunit/php-text-template", - "version": "1.2.1", - "version_normalized": "1.2.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" + "dev-master": "1.x-dev" + } }, - "time": "2015-06-21 13:50:34", - "type": "library", "installation-source": "dist", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Composer\\Semver\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "Semver library that offers utilities, version constraint parsing and validation.", "keywords": [ - "template" + "semantic", + "semver", + "validation", + "versioning" ] }, { - "name": "doctrine/instantiator", - "version": "1.0.5", - "version_normalized": "1.0.5.0", + "name": "sebastian/global-state", + "version": "1.1.1", + "version_normalized": "1.1.1.0", "source": { "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": ">=5.3.3" }, "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "~4.2" }, - "time": "2015-06-14 21:17:01", + "suggest": { + "ext-uopz": "*" + }, + "time": "2015-10-12 03:26:01", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", "keywords": [ - "constructor", - "instantiate" + "global state" ] }, { - "name": "phpunit/phpunit-mock-objects", - "version": "2.3.8", - "version_normalized": "2.3.8.0", + "name": "phpunit/phpunit", + "version": "4.8.18", + "version_normalized": "4.8.18.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa33d4ad96481b91df343d83e8c8aabed6b1dfd3", + "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", "php": ">=5.3.3", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", + "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "sebastian/exporter": "~1.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/php-timer": ">=1.0.6", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" }, "suggest": { - "ext-soap": "*" + "phpunit/php-invoker": "~1.1" }, - "time": "2015-10-02 06:51:40", + "time": "2015-11-11 11:32:49", + "bin": [ + "phpunit" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "4.8.x-dev" } }, "installation-source": "dist", @@ -2373,208 +2582,255 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", "keywords": [ - "mock", + "phpunit", + "testing", "xunit" ] }, { - "name": "phpunit/php-timer", - "version": "1.0.7", - "version_normalized": "1.0.7.0", + "name": "doctrine/cache", + "version": "v1.5.1", + "version_normalized": "1.5.1.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + "url": "https://github.com/doctrine/cache.git", + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.2" }, - "time": "2015-06-21 08:01:12", + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "phpunit/phpunit": ">=3.7", + "predis/predis": "~1.0", + "satooshi/php-coveralls": "~0.6" + }, + "time": "2015-11-02 18:35:48", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.5.x-dev" + } + }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Caching library offering an object-oriented API for many cache backends", + "homepage": "http://www.doctrine-project.org", "keywords": [ - "timer" + "cache", + "caching" ] }, { - "name": "phpunit/php-file-iterator", - "version": "1.4.1", - "version_normalized": "1.4.1.0", + "name": "doctrine/inflector", + "version": "v1.1.0", + "version_normalized": "1.1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + "url": "https://github.com/doctrine/inflector.git", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.2" }, - "time": "2015-06-21 13:08:43", + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "time": "2015-11-06 14:35:42", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.1.x-dev" } }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "Doctrine\\Common\\Inflector\\": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", "keywords": [ - "filesystem", - "iterator" + "inflection", + "pluralize", + "singularize", + "string" ] }, { - "name": "phpunit/php-code-coverage", - "version": "2.2.4", - "version_normalized": "2.2.4.0", + "name": "zendframework/zend-stdlib", + "version": "2.7.4", + "version_normalized": "2.7.4.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "cae029346a33663b998507f94962eb27de060683" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cae029346a33663b998507f94962eb27de060683", + "reference": "cae029346a33663b998507f94962eb27de060683", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0" + "php": ">=5.5", + "zendframework/zend-hydrator": "~1.0" }, "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4" + "athletic/athletic": "~0.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5", + "zendframework/zend-eventmanager": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-inputfilter": "~2.5", + "zendframework/zend-serializer": "~2.5", + "zendframework/zend-servicemanager": "~2.5" }, "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.2.1", - "ext-xmlwriter": "*" + "zendframework/zend-eventmanager": "To support aggregate hydrator usage", + "zendframework/zend-filter": "To support naming strategy hydrator usage", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" }, - "time": "2015-10-06 15:47:00", + "time": "2015-10-15 15:57:32", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" } }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Zend\\Stdlib\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "homepage": "https://github.com/zendframework/zend-stdlib", "keywords": [ - "coverage", - "testing", - "xunit" + "stdlib", + "zf2" ] }, { - "name": "phpspec/prophecy", - "version": "v1.5.0", - "version_normalized": "1.5.0.0", + "name": "guzzlehttp/promises", + "version": "1.0.3", + "version_normalized": "1.0.3.0", "source": { "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" + "url": "https://github.com/guzzle/promises.git", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", - "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "phpdocumentor/reflection-docblock": "~2.0", - "sebastian/comparator": "~1.1" + "php": ">=5.5.0" }, "require-dev": { - "phpspec/phpspec": "~2.0" + "phpunit/phpunit": "~4.0" }, - "time": "2015-08-13 10:07:40", + "time": "2015-10-15 22:28:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.0-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2582,136 +2838,109 @@ ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" } ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", + "description": "Guzzle promises library", "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" + "promise" ] }, { - "name": "phpunit/phpunit", - "version": "4.8.11", - "version_normalized": "4.8.11.0", + "name": "guzzlehttp/psr7", + "version": "1.2.1", + "version_normalized": "1.2.1.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5" + "url": "https://github.com/guzzle/psr7.git", + "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bdd199472410fd7e32751f9c814c7e06f2c21bd5", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/4d0bdbe1206df7440219ce14c972aa57cc5e4982", + "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": ">=1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.1", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" + "php": ">=5.4.0", + "psr/http-message": "~1.0" }, - "suggest": { - "phpunit/php-invoker": "~1.1" + "provide": { + "psr/http-message-implementation": "1.0" }, - "time": "2015-10-07 10:39:46", - "bin": [ - "phpunit" - ], + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "time": "2015-11-03 01:34:55", "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8.x-dev" + "dev-master": "1.0-dev" } }, "installation-source": "dist", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "description": "PSR-7 message implementation", "keywords": [ - "phpunit", - "testing", - "xunit" + "http", + "message", + "stream", + "uri" ] }, { - "name": "jcalderonzumba/gastonjs", - "version": "dev-master", - "version_normalized": "9999999-dev", + "name": "fabpot/goutte", + "version": "v3.1.2", + "version_normalized": "3.1.2.0", "source": { "type": "git", - "url": "https://github.com/jcalderonzumba/gastonjs.git", - "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad" + "url": "https://github.com/FriendsOfPHP/Goutte.git", + "reference": "3cbc6ed222422a28400e470050f14928a153207e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/5e231b4df98275c404e1371fc5fadd34f6a121ad", - "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3cbc6ed222422a28400e470050f14928a153207e", + "reference": "3cbc6ed222422a28400e470050f14928a153207e", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "~5.0|~6.0", - "php": ">=5.4" - }, - "require-dev": { - "phpunit/phpunit": "~4.6", - "silex/silex": "~1.2", - "symfony/phpunit-bridge": "~2.7", - "symfony/process": "~2.1" + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5.0", + "symfony/browser-kit": "~2.1|~3.0", + "symfony/css-selector": "~2.1|~3.0", + "symfony/dom-crawler": "~2.1|~3.0" }, - "time": "2015-10-07 11:40:41", - "type": "phantomjs-api", + "time": "2015-11-05 12:58:44", + "type": "application", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.1-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-4": { - "Zumba\\GastonJS\\": "src" + "Goutte\\": "Goutte" } }, "notification-url": "https://packagist.org/downloads/", @@ -2720,60 +2949,55 @@ ], "authors": [ { - "name": "Juan Francisco Calderón Zumba", - "email": "juanfcz@gmail.com", - "homepage": "http://github.com/jcalderonzumba" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], - "description": "PhantomJS API based server for webpage automation", - "homepage": "https://github.com/jcalderonzumba/gastonjs", + "description": "A simple PHP Web Scraper", + "homepage": "https://github.com/FriendsOfPHP/Goutte", "keywords": [ - "api", - "automation", - "browser", - "headless", - "phantomjs" + "scraper" ] }, { - "name": "jcalderonzumba/mink-phantomjs-driver", - "version": "dev-master", - "version_normalized": "9999999-dev", + "name": "guzzlehttp/guzzle", + "version": "6.1.1", + "version_normalized": "6.1.1.0", "source": { "type": "git", - "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git", - "reference": "10d7c48c9a4129463052321b52450d98983c4332" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/10d7c48c9a4129463052321b52450d98983c4332", - "reference": "10d7c48c9a4129463052321b52450d98983c4332", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c", "shasum": "" }, "require": { - "behat/mink": "~1.6", - "jcalderonzumba/gastonjs": "~1.0", - "php": ">=5.4", - "twig/twig": "~1.8" + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.5.0" }, "require-dev": { - "phpunit/phpunit": "~4.6", - "silex/silex": "~1.2", - "symfony/css-selector": "~2.1", - "symfony/phpunit-bridge": "~2.7", - "symfony/process": "~2.3" + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" }, - "time": "2015-10-05 18:24:44", - "type": "mink-driver", + "time": "2015-11-23 00:47:50", + "type": "library", "extra": { "branch-alias": { - "dev-master": "0.4.x-dev" + "dev-master": "6.1-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { + "files": [ + "src/functions_include.php" + ], "psr-4": { - "Zumba\\Mink\\Driver\\": "src" + "GuzzleHttp\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2782,163 +3006,156 @@ ], "authors": [ { - "name": "Juan Francisco Calderón Zumba", - "email": "juanfcz@gmail.com", - "homepage": "http://github.com/jcalderonzumba" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" } ], - "description": "PhantomJS driver for Mink framework", - "homepage": "http://mink.behat.org/", + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", "keywords": [ - "ajax", - "browser", - "headless", - "javascript", - "phantomjs", - "testing" + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" ] }, { - "name": "symfony/class-loader", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "zendframework/zend-feed", + "version": "2.6.0", + "version_normalized": "2.6.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/class-loader.git", - "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4" + "url": "https://github.com/zendframework/zend-feed.git", + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/320f8d2a9cdbcbeb24be602c124aae9d998474a4", - "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5", + "zendframework/zend-escaper": "~2.5", + "zendframework/zend-stdlib": "~2.5" }, "require-dev": { - "symfony/finder": "~2.0,>=2.0.5" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "psr/http-message": "^1.0", + "zendframework/zend-cache": "~2.5", + "zendframework/zend-db": "~2.5", + "zendframework/zend-http": "~2.5", + "zendframework/zend-validator": "~2.5" }, - "time": "2015-10-23 14:47:27", + "suggest": { + "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", + "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent" + }, + "time": "2015-11-24 15:38:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\ClassLoader\\": "" + "Zend\\Feed\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } + "BSD-3-Clause" ], - "description": "Symfony ClassLoader Component", - "homepage": "https://symfony.com" + "description": "provides functionality for consuming RSS and Atom feeds", + "homepage": "https://github.com/zendframework/zend-feed", + "keywords": [ + "feed", + "zf2" + ] }, { - "name": "symfony/console", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "zendframework/zend-diactoros", + "version": "1.2.0", + "version_normalized": "1.2.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "5efd632294c8320ea52492db22292ff853a43766" + "url": "https://github.com/zendframework/zend-diactoros.git", + "reference": "edfda00b9831630c19c411f85f50a47bb66af457" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766", - "reference": "5efd632294c8320ea52492db22292ff853a43766", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/edfda00b9831630c19c411f85f50a47bb66af457", + "reference": "edfda00b9831630c19c411f85f50a47bb66af457", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.4", + "psr/http-message": "~1.0" }, - "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "provide": { + "psr/http-message-implementation": "~1.0.0" }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" + "require-dev": { + "phpunit/phpunit": "~4.6", + "squizlabs/php_codesniffer": "^2.3.1" }, - "time": "2015-10-20 14:38:46", + "time": "2015-11-24 19:16:22", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Console\\": "" + "Zend\\Diactoros\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } + "BSD-2-Clause" ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com" + "description": "PSR HTTP Message implementations", + "homepage": "https://github.com/zendframework/zend-diactoros", + "keywords": [ + "http", + "psr", + "psr-7" + ] }, { - "name": "symfony/dependency-injection", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/css-selector", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/dependency-injection.git", - "reference": "af284e795ec8a08c80d1fc47518fd23004b89847" + "url": "https://github.com/symfony/css-selector.git", + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/af284e795ec8a08c80d1fc47518fd23004b89847", - "reference": "af284e795ec8a08c80d1fc47518fd23004b89847", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/abb47717fb88aebd9437da2fc8bb01a50a36679f", + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "conflict": { - "symfony/expression-language": "<2.6" - }, - "require-dev": { - "symfony/config": "~2.2", - "symfony/expression-language": "~2.6", - "symfony/yaml": "~2.1" - }, - "suggest": { - "symfony/config": "", - "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", - "symfony/yaml": "" - }, - "time": "2015-10-27 15:38:06", + "time": "2015-10-30 20:10:21", "type": "library", "extra": { "branch-alias": { @@ -2948,8 +3165,11 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\DependencyInjection\\": "" - } + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2957,6 +3177,10 @@ ], "authors": [ { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { "name": "Fabien Potencier", "email": "fabien@symfony.com" }, @@ -2965,22 +3189,22 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony DependencyInjection Component", + "description": "Symfony CssSelector Component", "homepage": "https://symfony.com" }, { "name": "symfony/debug", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b" + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fb9e6887db716939f41af0ba8ef38a1582eb501b", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b", + "url": "https://api.github.com/repos/symfony/debug/zipball/0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", "shasum": "" }, "require": { @@ -2994,7 +3218,7 @@ "symfony/class-loader": "~2.2", "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" }, - "time": "2015-10-11 09:39:48", + "time": "2015-10-30 20:10:21", "type": "library", "extra": { "branch-alias": { @@ -3005,7 +3229,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3025,27 +3252,30 @@ "homepage": "https://symfony.com" }, { - "name": "symfony/http-foundation", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/dom-crawler", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "7598eea151ae3d4134df1f9957364b17809eea75" + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7598eea151ae3d4134df1f9957364b17809eea75", - "reference": "7598eea151ae3d4134df1f9957364b17809eea75", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b33593cbfe1d81b50d48353f338aca76a08658d8", + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8", "shasum": "" }, "require": { "php": ">=5.3.9" }, "require-dev": { - "symfony/expression-language": "~2.4" + "symfony/css-selector": "~2.3" + }, + "suggest": { + "symfony/css-selector": "" }, - "time": "2015-10-23 14:47:27", + "time": "2015-11-02 20:20:53", "type": "library", "extra": { "branch-alias": { @@ -3055,10 +3285,10 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" + "Symfony\\Component\\DomCrawler\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3075,39 +3305,36 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpFoundation Component", + "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com" }, { - "name": "symfony/event-dispatcher", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/browser-kit", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8" + "url": "https://github.com/symfony/browser-kit.git", + "reference": "bd28847ea2193916074c7b11d4fdd78570049694" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/bd28847ea2193916074c7b11d4fdd78570049694", + "reference": "bd28847ea2193916074c7b11d4fdd78570049694", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/dom-crawler": "~2.0,>=2.0.5" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/stopwatch": "~2.3" + "symfony/css-selector": "~2.0,>=2.0.5", + "symfony/process": "~2.3.34|~2.7,>=2.7.6" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "symfony/process": "" }, - "time": "2015-10-11 09:39:48", + "time": "2015-11-02 20:20:53", "type": "library", "extra": { "branch-alias": { @@ -3117,8 +3344,11 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - } + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3134,72 +3364,57 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com" }, { - "name": "symfony/http-kernel", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/serializer", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/http-kernel.git", - "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77" + "url": "https://github.com/symfony/serializer.git", + "reference": "aab4ce70b7d1ae7290388172141e776de18d4a1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4260f2273a446a6715063dc9ca89fd0c475c2f77", - "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77", + "url": "https://api.github.com/repos/symfony/serializer/zipball/aab4ce70b7d1ae7290388172141e776de18d4a1f", + "reference": "aab4ce70b7d1ae7290388172141e776de18d4a1f", "shasum": "" }, "require": { "php": ">=5.3.9", - "psr/log": "~1.0", - "symfony/debug": "~2.6,>=2.6.2", - "symfony/event-dispatcher": "~2.6,>=2.6.7", - "symfony/http-foundation": "~2.5,>=2.5.4" - }, - "conflict": { - "symfony/config": "<2.7" + "symfony/polyfill-php55": "~1.0" }, "require-dev": { - "symfony/browser-kit": "~2.3", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.7", - "symfony/console": "~2.3", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.2", - "symfony/dom-crawler": "~2.0,>=2.0.5", - "symfony/expression-language": "~2.4", - "symfony/finder": "~2.0,>=2.0.5", - "symfony/process": "~2.0,>=2.0.5", - "symfony/routing": "~2.2", - "symfony/stopwatch": "~2.3", - "symfony/templating": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/var-dumper": "~2.6" + "doctrine/annotations": "~1.0", + "doctrine/cache": "~1.0", + "symfony/config": "~2.2|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { - "symfony/browser-kit": "", - "symfony/class-loader": "", - "symfony/config": "", - "symfony/console": "", - "symfony/dependency-injection": "", - "symfony/finder": "", - "symfony/var-dumper": "" + "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", + "doctrine/cache": "For using the default cached annotation reader and metadata cache.", + "symfony/config": "For using the XML mapping loader.", + "symfony/property-access": "For using the ObjectNormalizer.", + "symfony/yaml": "For using the default YAML mapping loader." }, - "time": "2015-10-27 19:07:21", + "time": "2015-11-28 10:40:16", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\HttpKernel\\": "" - } + "Symfony\\Component\\Serializer\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3215,57 +3430,45 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpKernel Component", + "description": "Symfony Serializer Component", "homepage": "https://symfony.com" }, { - "name": "symfony/routing", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/class-loader", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "f353e1f588679c3ec987624e6c617646bd01ba38" + "url": "https://github.com/symfony/class-loader.git", + "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f353e1f588679c3ec987624e6c617646bd01ba38", - "reference": "f353e1f588679c3ec987624e6c617646bd01ba38", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/51f83451bf0ddfc696e47e4642d6cd10fcfce160", + "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "conflict": { - "symfony/config": "<2.7" - }, "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", - "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" - }, - "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/finder": "~2.0,>=2.0.5|~3.0.0" }, - "time": "2015-10-27 15:38:06", + "time": "2015-11-26 07:00:59", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Routing\\": "" - } + "Symfony\\Component\\ClassLoader\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3281,59 +3484,53 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Routing Component", - "homepage": "https://symfony.com", - "keywords": [ - "router", - "routing", - "uri", - "url" - ] + "description": "Symfony ClassLoader Component", + "homepage": "https://symfony.com" }, { - "name": "symfony/serializer", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/console", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/serializer.git", - "reference": "14056684acad23b8815eb336bccc0b4ac76bd823" + "url": "https://github.com/symfony/console.git", + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/14056684acad23b8815eb336bccc0b4ac76bd823", - "reference": "14056684acad23b8815eb336bccc0b4ac76bd823", + "url": "https://api.github.com/repos/symfony/console/zipball/d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/cache": "~1.0", - "symfony/config": "~2.2", - "symfony/property-access": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" }, "suggest": { - "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", - "doctrine/cache": "For using the default cached annotation reader and metadata cache.", - "symfony/config": "For using the XML mapping loader.", - "symfony/property-access": "For using the ObjectNormalizer.", - "symfony/yaml": "For using the default YAML mapping loader." + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" }, - "time": "2015-10-11 09:39:48", + "time": "2015-11-30 12:35:10", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Serializer\\": "" - } + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3349,53 +3546,55 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Serializer Component", + "description": "Symfony Console Component", "homepage": "https://symfony.com" }, { - "name": "symfony/translation", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/dependency-injection", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8" + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "1ac8ce1a1cff7ff9467d44bc71b0f71dfa751ba4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8", - "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1ac8ce1a1cff7ff9467d44bc71b0f71dfa751ba4", + "reference": "1ac8ce1a1cff7ff9467d44bc71b0f71dfa751ba4", "shasum": "" }, "require": { "php": ">=5.3.9" }, "conflict": { - "symfony/config": "<2.7" + "symfony/expression-language": "<2.6" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/intl": "~2.4", - "symfony/yaml": "~2.2" + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/yaml": "~2.1|~3.0.0" }, "suggest": { - "psr/log": "To use logging capability in translator", "symfony/config": "", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", "symfony/yaml": "" }, - "time": "2015-10-27 15:38:06", + "time": "2015-11-30 06:56:28", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Translation\\": "" - } + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3411,63 +3610,46 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Translation Component", + "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com" }, { - "name": "symfony/validator", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/http-foundation", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/validator.git", - "reference": "df9021e689aa3d08367881e7f8917219fabe5e64" + "url": "https://github.com/symfony/http-foundation.git", + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/df9021e689aa3d08367881e7f8917219fabe5e64", - "reference": "df9021e689aa3d08367881e7f8917219fabe5e64", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/translation": "~2.4" + "symfony/polyfill-php54": "~1.0" }, "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/cache": "~1.0", - "doctrine/common": "~2.3", - "egulias/email-validator": "~1.2,>=1.2.1", - "symfony/config": "~2.2", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.1", - "symfony/intl": "~2.4", - "symfony/property-access": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" - }, - "suggest": { - "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", - "doctrine/cache": "For using the default cached annotation reader and metadata cache.", - "egulias/email-validator": "Strict (RFC compliant) email validation", - "symfony/config": "", - "symfony/expression-language": "For using the 2.4 Expression validator", - "symfony/http-foundation": "", - "symfony/intl": "", - "symfony/property-access": "For using the 2.4 Validator API", - "symfony/yaml": "" + "symfony/expression-language": "~2.4|~3.0.0" }, - "time": "2015-10-18 20:23:18", + "time": "2015-11-27 11:03:19", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Validator\\": "" - } + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3483,39 +3665,53 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Validator Component", + "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com" }, { - "name": "symfony/process", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/event-dispatcher", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7", - "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "time": "2015-10-23 14:47:27", + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "time": "2015-10-30 20:15:42", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Process\\": "" - } + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3531,39 +3727,75 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Process Component", + "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com" }, { - "name": "symfony/yaml", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/http-kernel", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" + "url": "https://github.com/symfony/http-kernel.git", + "reference": "a77cf7e6fe1f3ac158b2eb17f89e8efdf7820905" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a77cf7e6fe1f3ac158b2eb17f89e8efdf7820905", + "reference": "a77cf7e6fe1f3ac158b2eb17f89e8efdf7820905", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "psr/log": "~1.0", + "symfony/debug": "~2.6,>=2.6.2", + "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", + "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0" + }, + "conflict": { + "symfony/config": "<2.7" + }, + "require-dev": { + "symfony/browser-kit": "~2.3|~3.0.0", + "symfony/class-loader": "~2.1|~3.0.0", + "symfony/config": "~2.8", + "symfony/console": "~2.3|~3.0.0", + "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.8|~3.0.0", + "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/finder": "~2.0,>=2.0.5|~3.0.0", + "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/routing": "~2.8|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0", + "symfony/templating": "~2.2|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/var-dumper": "~2.6|~3.0.0" + }, + "suggest": { + "symfony/browser-kit": "", + "symfony/class-loader": "", + "symfony/config": "", + "symfony/console": "", + "symfony/dependency-injection": "", + "symfony/finder": "", + "symfony/var-dumper": "" }, - "time": "2015-10-11 09:39:48", + "time": "2015-11-30 17:25:56", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\Yaml\\": "" - } + "Symfony\\Component\\HttpKernel\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3579,39 +3811,61 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com" }, { - "name": "symfony/css-selector", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/routing", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b" + "url": "https://github.com/symfony/routing.git", + "reference": "f76830dc0f8068df36226dc822e7fc1f5f73be46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b", + "url": "https://api.github.com/repos/symfony/routing/zipball/f76830dc0f8068df36226dc822e7fc1f5f73be46", + "reference": "f76830dc0f8068df36226dc822e7fc1f5f73be46", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "time": "2015-10-11 09:39:48", + "conflict": { + "symfony/config": "<2.7" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "doctrine/common": "~2.2", + "psr/log": "~1.0", + "symfony/config": "~2.7|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/http-foundation": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" + }, + "suggest": { + "doctrine/annotations": "For using the annotation loader", + "symfony/config": "For using the all-in-one router or any loader", + "symfony/dependency-injection": "For loading routes from a service", + "symfony/expression-language": "For using expression matching", + "symfony/yaml": "For using the YAML loader" + }, + "time": "2015-11-26 07:00:59", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - } + "Symfony\\Component\\Routing\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3619,10 +3873,6 @@ ], "authors": [ { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { "name": "Fabien Potencier", "email": "fabien@symfony.com" }, @@ -3631,45 +3881,63 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com" + "description": "Symfony Routing Component", + "homepage": "https://symfony.com", + "keywords": [ + "router", + "routing", + "uri", + "url" + ] }, { - "name": "symfony/dom-crawler", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/translation", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612" + "url": "https://github.com/symfony/translation.git", + "reference": "6772657767649fc3b31df12705194fb4af11ef98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5fef7d8b80d8f9992df99d8ee283f420484c9612", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612", + "url": "https://api.github.com/repos/symfony/translation/zipball/6772657767649fc3b31df12705194fb4af11ef98", + "reference": "6772657767649fc3b31df12705194fb4af11ef98", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/config": "<2.7" }, "require-dev": { - "symfony/css-selector": "~2.3" + "psr/log": "~1.0", + "symfony/config": "~2.8", + "symfony/intl": "~2.4|~3.0.0", + "symfony/yaml": "~2.2|~3.0.0" }, "suggest": { - "symfony/css-selector": "" + "psr/log": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" }, - "time": "2015-10-11 09:39:48", + "time": "2015-11-18 13:45:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - } + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3685,47 +3953,65 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony DomCrawler Component", + "description": "Symfony Translation Component", "homepage": "https://symfony.com" }, { - "name": "symfony/browser-kit", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "symfony/validator", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367" + "url": "https://github.com/symfony/validator.git", + "reference": "8c42b96f5b23f0642c1a518addafcef8077154a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/07d664a052572ccc28eb2ab7dbbe82155b1ad367", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367", + "url": "https://api.github.com/repos/symfony/validator/zipball/8c42b96f5b23f0642c1a518addafcef8077154a2", + "reference": "8c42b96f5b23f0642c1a518addafcef8077154a2", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/dom-crawler": "~2.0,>=2.0.5" + "symfony/translation": "~2.4|~3.0.0" }, "require-dev": { - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/process": "~2.3.34|~2.7,>=2.7.6" + "doctrine/annotations": "~1.0", + "doctrine/cache": "~1.0", + "egulias/email-validator": "~1.2,>=1.2.1", + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/http-foundation": "~2.1|~3.0.0", + "symfony/intl": "~2.4|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { - "symfony/process": "" + "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", + "doctrine/cache": "For using the default cached annotation reader and metadata cache.", + "egulias/email-validator": "Strict (RFC compliant) email validation", + "symfony/config": "", + "symfony/expression-language": "For using the 2.4 Expression validator", + "symfony/http-foundation": "", + "symfony/intl": "", + "symfony/property-access": "For using the 2.4 Validator API", + "symfony/yaml": "" }, - "time": "2015-10-23 14:47:27", + "time": "2015-11-20 14:39:26", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\BrowserKit\\": "" - } + "Symfony\\Component\\Validator\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3741,110 +4027,93 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony BrowserKit Component", + "description": "Symfony Validator Component", "homepage": "https://symfony.com" }, { - "name": "twig/twig", - "version": "v1.23.1", - "version_normalized": "1.23.1.0", + "name": "symfony/process", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" + "url": "https://github.com/symfony/process.git", + "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "url": "https://api.github.com/repos/symfony/process/zipball/1b988a88e3551102f3c2d9e1d47a18c3a78d6312", + "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312", "shasum": "" }, "require": { - "php": ">=5.2.7" - }, - "require-dev": { - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" + "php": ">=5.3.9" }, - "time": "2015-11-05 12:49:06", + "time": "2015-11-30 12:35:10", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.23-dev" + "dev-master": "2.8-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "Twig_": "lib/" - } + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" + "email": "fabien@symfony.com" }, { - "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", - "role": "Contributors" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", - "keywords": [ - "templating" - ] + "description": "Symfony Process Component", + "homepage": "https://symfony.com" }, { - "name": "wikimedia/composer-merge-plugin", - "version": "v1.3.0", - "version_normalized": "1.3.0.0", + "name": "symfony/yaml", + "version": "v2.8.0", + "version_normalized": "2.8.0.0", "source": { "type": "git", - "url": "https://github.com/wikimedia/composer-merge-plugin.git", - "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9" + "url": "https://github.com/symfony/yaml.git", + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", - "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f79824187de95064a2f5038904c4d7f0227fedb5", + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0", - "php": ">=5.3.2" - }, - "require-dev": { - "composer/composer": "1.0.*@dev", - "jakub-onderka/php-parallel-lint": "~0.8", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "~2.1.0" + "php": ">=5.3.9" }, - "time": "2015-11-06 20:31:16", - "type": "composer-plugin", + "time": "2015-11-30 12:35:10", + "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" - }, - "class": "Wikimedia\\Composer\\MergePlugin" + "dev-master": "2.8-dev" + } }, "installation-source": "dist", "autoload": { "psr-4": { - "Wikimedia\\Composer\\": "src/" - } + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3852,10 +4121,15 @@ ], "authors": [ { - "name": "Bryan Davis", - "email": "bd808@wikimedia.org" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Composer plugin to merge multiple composer.json files" + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com" } ] diff --git a/vendor/composer/installers/.travis.yml b/vendor/composer/installers/.travis.yml index 81ca8e1..dc4ecf4 100644 --- a/vendor/composer/installers/.travis.yml +++ b/vendor/composer/installers/.travis.yml @@ -5,10 +5,17 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 - hhvm -before_script: - - curl -s http://getcomposer.org/installer | php -- --quiet - - php composer.phar install --dev +matrix: + fast_finish: true + allow_failures: + - php: 7.0 -script: phpunit +before_script: + - composer self-update + - composer install + +script: + - phpunit diff --git a/vendor/composer/installers/README.md b/vendor/composer/installers/README.md index b331771..3a9664e 100644 --- a/vendor/composer/installers/README.md +++ b/vendor/composer/installers/README.md @@ -36,6 +36,7 @@ is not needed to install packages with these frameworks: | Aimeos | `aimeos-extension` | Asgard | `asgard-module`
`asgard-theme` | AGL | `agl-module` +| Bonefish | `bonefish-package` | AnnotateCms | `annotatecms-module`
`annotatecms-component`
`annotatecms-service` | Bitrix | `bitrix-module`
`bitrix-component`
`bitrix-theme` | CakePHP 2+ | **`cakephp-plugin`** @@ -55,6 +56,7 @@ is not needed to install packages with these frameworks: | Hurad | `hurad-plugin`
`hurad-theme` | Joomla | `joomla-component`
`joomla-module`
`joomla-template`
`joomla-plugin`
`joomla-library` | Kirby | **`kirby-plugin`** +| KodiCMS | `kodicms-plugin`
`kodicms-media` | Kohana | **`kohana-module`** | Laravel | `laravel-library` | Lithium | **`lithium-library`
`lithium-source`** @@ -166,8 +168,8 @@ not be inflected. ## Contribute! * [Fork and clone](https://help.github.com/articles/fork-a-repo). -* Run the command `php composer.phar install --dev` to install the dev - dependencies. See [Composer](https://github.com/composer/composer#installation--usage). +* Run the command `php composer.phar install` to install the dependencies. + This will also install the dev dependencies. See [Composer](https://getcomposer.org/doc/03-cli.md#install). * Use the command `phpunit` to run the tests. See [PHPUnit](http://phpunit.de). * Create a branch, commit, push and send us a [pull request](https://help.github.com/articles/using-pull-requests). diff --git a/vendor/composer/installers/composer.json b/vendor/composer/installers/composer.json index 6ee931e..19e5f0f 100644 --- a/vendor/composer/installers/composer.json +++ b/vendor/composer/installers/composer.json @@ -1,6 +1,6 @@ { "name": "composer/installers", - "type": "composer-installer", + "type": "composer-plugin", "license": "MIT", "description": "A multi-framework Composer library installer", "keywords": [ @@ -61,7 +61,7 @@ "psr-0": { "Composer\\Installers\\": "src/" } }, "extra": { - "class": "Composer\\Installers\\Installer", + "class": "Composer\\Installers\\Plugin", "branch-alias": { "dev-master": "1.0-dev" } @@ -70,6 +70,9 @@ "shama/baton": "*", "roundcube/plugin-installer": "*" }, + "require": { + "composer-plugin-api": "1.0.0" + }, "require-dev": { "composer/composer": "1.0.*@dev", "phpunit/phpunit": "4.1.*" diff --git a/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php b/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php index cc27d3e..43938ec 100644 --- a/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php +++ b/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php @@ -1,6 +1,7 @@ composer = $composer; $this->package = $package; + $this->io = $io; } /** diff --git a/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php b/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php index 48a8367..9c79838 100644 --- a/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php +++ b/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php @@ -1,11 +1,89 @@ + * @author Denis Kulichkin + */ class BitrixInstaller extends BaseInstaller { protected $locations = array( - 'module' => 'local/modules/{$name}/', - 'component' => 'local/components/{$name}/', - 'theme' => 'local/templates/{$name}/' + 'module' => 'bitrix/modules/{$name}/', + 'component' => 'bitrix/components/{$name}/', + 'theme' => 'bitrix/templates/{$name}/', ); + + /** + * @var array Storage for informations about duplicates at all the time of installation packages + */ + private static $checkedDuplicates = array(); + + /** + * {@inheritdoc} + */ + protected function templatePath($path, array $vars = array()) + { + $templatePath = parent::templatePath($path, $vars); + $this->checkDuplicates($templatePath, $vars); + + return $templatePath; + } + + /** + * Duplicates search packages + * + * @param string $templatePath + * @param array $vars + */ + protected function checkDuplicates($templatePath, array $vars = array()) + { + /** + * Incorrect paths for backward compatibility + */ + $oldLocations = array( + 'module' => 'local/modules/{$name}/', + 'component' => 'local/components/{$name}/', + 'theme' => 'local/templates/{$name}/' + ); + + $packageType = substr($vars['type'], strlen('bitrix') + 1); + $oldLocation = str_replace('{$name}', $vars['name'], $oldLocations[$packageType]); + + if (in_array($oldLocation, static::$checkedDuplicates)) { + return; + } + + if ($oldLocation !== $templatePath && file_exists($oldLocation) && $this->io && $this->io->isInteractive()) { + + $this->io->writeError(' Duplication of packages:'); + $this->io->writeError(' Package ' . $oldLocation . ' will be called instead package ' . $templatePath . ''); + + while (true) { + switch ($this->io->ask(' Delete ' . $oldLocation . ' [y,n,?]? ', '?')) { + case 'y': + $fs = new Filesystem(); + $fs->removeDirectory($oldLocation); + break 2; + + case 'n': + break 2; + + case '?': + default: + $this->io->writeError(array( + ' y - delete package ' . $oldLocation . ' and to continue with the installation', + ' n - don\'t delete and to continue with the installation', + )); + $this->io->writeError(' ? - print help'); + break; + } + } + } + + static::$checkedDuplicates[] = $oldLocation; + } } diff --git a/vendor/composer/installers/src/Composer/Installers/BonefishInstaller.php b/vendor/composer/installers/src/Composer/Installers/BonefishInstaller.php new file mode 100644 index 0000000..da3aad2 --- /dev/null +++ b/vendor/composer/installers/src/Composer/Installers/BonefishInstaller.php @@ -0,0 +1,9 @@ + 'Packages/{$vendor}/{$name}/' + ); +} diff --git a/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php b/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php index cbeb60b..176c91a 100644 --- a/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php +++ b/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php @@ -3,8 +3,6 @@ use Composer\DependencyResolver\Pool; use Composer\Package\PackageInterface; -use Composer\Package\LinkConstraint\MultiConstraint; -use Composer\Package\LinkConstraint\VersionConstraint; class CakePHPInstaller extends BaseInstaller { @@ -52,21 +50,29 @@ public function getLocations() */ protected function matchesCakeVersion($matcher, $version) { + if (class_exists('Composer\Semver\Constraint\MultiConstraint')) { + $multiClass = 'Composer\Semver\Constraint\MultiConstraint'; + $constraintClass = 'Composer\Semver\Constraint\Constraint'; + } else { + $multiClass = 'Composer\Package\LinkConstraint\MultiConstraint'; + $constraintClass = 'Composer\Package\LinkConstraint\VersionConstraint'; + } + $repositoryManager = $this->composer->getRepositoryManager(); if ($repositoryManager) { $repos = $repositoryManager->getLocalRepository(); if (!$repos) { return false; } - $cake3 = new MultiConstraint(array( - new VersionConstraint($matcher, $version), - new VersionConstraint('!=', '9999999-dev'), + $cake3 = new $multiClass(array( + new $constraintClass($matcher, $version), + new $constraintClass('!=', '9999999-dev'), )); $pool = new Pool('dev'); $pool->addRepository($repos); $packages = $pool->whatProvides('cakephp/cakephp'); foreach ($packages as $package) { - $installed = new VersionConstraint('=', $package->getVersion()); + $installed = new $constraintClass('=', $package->getVersion()); if ($cake3->matches($installed)) { return true; break; diff --git a/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php b/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php index dc3be8d..d37a77a 100644 --- a/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php +++ b/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php @@ -1,9 +1,35 @@ 'craft/plugins/{$name}/', ); + + /** + * Strip `craft-` prefix and/or `-plugin` suffix from package names + * + * @param array $vars + * + * @return array + */ + final public function inflectPackageVars($vars) + { + return $this->inflectPluginVars($vars); + } + + private function inflectPluginVars($vars) + { + $vars['name'] = preg_replace('/-' . self::NAME_SUFFIX . '$/i', '', $vars['name']); + $vars['name'] = preg_replace('/^' . self::NAME_PREFIX . '-/i', '', $vars['name']); + + return $vars; + } } diff --git a/vendor/composer/installers/src/Composer/Installers/Installer.php b/vendor/composer/installers/src/Composer/Installers/Installer.php index 63ba64c..6d04c61 100644 --- a/vendor/composer/installers/src/Composer/Installers/Installer.php +++ b/vendor/composer/installers/src/Composer/Installers/Installer.php @@ -1,6 +1,7 @@ 'AglInstaller', 'annotatecms' => 'AnnotateCmsInstaller', 'bitrix' => 'BitrixInstaller', + 'bonefish' => 'BonefishInstaller', 'cakephp' => 'CakePHPInstaller', 'chef' => 'ChefInstaller', 'ccframework' => 'ClanCatsFrameworkInstaller', @@ -35,6 +37,7 @@ class Installer extends LibraryInstaller 'hurad' => 'HuradInstaller', 'joomla' => 'JoomlaInstaller', 'kirby' => 'KirbyInstaller', + 'kodicms' => 'KodiCMSInstaller', 'kohana' => 'KohanaInstaller', 'laravel' => 'LaravelInstaller', 'lithium' => 'LithiumInstaller', @@ -67,7 +70,7 @@ class Installer extends LibraryInstaller 'wordpress' => 'WordPressInstaller', 'zend' => 'ZendInstaller', 'zikula' => 'ZikulaInstaller', - 'prestashop' => 'PrestashopInstaller', + 'prestashop' => 'PrestashopInstaller' ); /** @@ -85,7 +88,7 @@ public function getInstallPath(PackageInterface $package) } $class = 'Composer\\Installers\\' . $this->supportedTypes[$frameworkType]; - $installer = new $class($package, $this->composer); + $installer = new $class($package, $this->composer, $this->getIO()); return $installer->getInstallPath($package, $frameworkType); } @@ -153,11 +156,21 @@ protected function getLocationPattern($frameworkType) if (!empty($this->supportedTypes[$frameworkType])) { $frameworkClass = 'Composer\\Installers\\' . $this->supportedTypes[$frameworkType]; /** @var BaseInstaller $framework */ - $framework = new $frameworkClass(null, $this->composer); + $framework = new $frameworkClass(null, $this->composer, $this->getIO()); $locations = array_keys($framework->getLocations()); $pattern = $locations ? '(' . implode('|', $locations) . ')' : false; } return $pattern ? : '(\w+)'; } + + /** + * Get I/O object + * + * @return IOInterface + */ + private function getIO() + { + return $this->io; + } } diff --git a/vendor/composer/installers/src/Composer/Installers/KodiCMSInstaller.php b/vendor/composer/installers/src/Composer/Installers/KodiCMSInstaller.php new file mode 100644 index 0000000..7143e23 --- /dev/null +++ b/vendor/composer/installers/src/Composer/Installers/KodiCMSInstaller.php @@ -0,0 +1,10 @@ + 'cms/plugins/{$name}/', + 'media' => 'cms/media/vendor/{$name}/' + ); +} \ No newline at end of file diff --git a/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php b/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php index 04be73c..3cdda6c 100644 --- a/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php +++ b/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php @@ -6,6 +6,7 @@ class MoodleInstaller extends BaseInstaller protected $locations = array( 'mod' => 'mod/{$name}/', 'admin_report' => 'admin/report/{$name}/', + 'atto' => 'lib/editor/atto/plugins/{$name}/', 'tool' => 'admin/tool/{$name}/', 'assignment' => 'mod/assignment/type/{$name}/', 'assignsubmission' => 'mod/assign/submission/{$name}/', @@ -13,6 +14,9 @@ class MoodleInstaller extends BaseInstaller 'auth' => 'auth/{$name}/', 'availability' => 'availability/condition/{$name}/', 'block' => 'blocks/{$name}/', + 'booktool' => 'mod/book/tool/{$name}/', + 'cachestore' => 'cache/stores/{$name}/', + 'cachelock' => 'cache/locks/{$name}/', 'calendartype' => 'calendar/type/{$name}/', 'format' => 'course/format/{$name}/', 'coursereport' => 'course/report/{$name}/', @@ -26,7 +30,11 @@ class MoodleInstaller extends BaseInstaller 'gradereport' => 'grade/report/{$name}/', 'gradingform' => 'grade/grading/form/{$name}/', 'local' => 'local/{$name}/', + 'logstore' => 'admin/tool/log/store/{$name}/', + 'ltisource' => 'mod/lti/source/{$name}/', + 'ltiservice' => 'mod/lti/service/{$name}/', 'message' => 'message/output/{$name}/', + 'mnetservice' => 'mnet/service/{$name}/', 'plagiarism' => 'plagiarism/{$name}/', 'portfolio' => 'portfolio/{$name}/', 'qbehaviour' => 'question/behaviour/{$name}/', @@ -38,6 +46,7 @@ class MoodleInstaller extends BaseInstaller 'repository' => 'repository/{$name}/', 'scormreport' => 'mod/scorm/report/{$name}/', 'theme' => 'theme/{$name}/', + 'tinymce' => 'lib/editor/tinymce/plugins/{$name}/', 'profilefield' => 'user/profile/field/{$name}/', 'webservice' => 'webservice/{$name}/', 'workshopallocation' => 'mod/workshop/allocation/{$name}/', diff --git a/vendor/composer/installers/src/Composer/Installers/Plugin.php b/vendor/composer/installers/src/Composer/Installers/Plugin.php new file mode 100644 index 0000000..5eb04af --- /dev/null +++ b/vendor/composer/installers/src/Composer/Installers/Plugin.php @@ -0,0 +1,17 @@ +getInstallationManager()->addInstaller($installer); + } +} diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php index 976bd9b..523e847 100644 --- a/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php +++ b/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php @@ -100,7 +100,7 @@ public function testGetLocations() { $this->setCakephpVersion($rm, '~8.8'); $result = $installer->getLocations(); - $this->assertEquals('vendor/{$vendor}/{$name}/', $result['plugin']); + $this->assertContains('vendor/{$vendor}/{$name}/', $result['plugin']); } protected function setCakephpVersion($rm, $version) { diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/CraftInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/CraftInstallerTest.php new file mode 100644 index 0000000..31ccecd --- /dev/null +++ b/vendor/composer/installers/tests/Composer/Installers/Test/CraftInstallerTest.php @@ -0,0 +1,83 @@ +installer = new CraftInstaller(); + } + + /** + * @param string $packageName + * @param string $expectedName + * + * @covers ::inflectPackageVars + * + * @dataProvider provideExpectedInflectionResults + */ + final public function testInflectPackageVars($packageName, $expectedName) + { + $installer = $this->installer; + + $vars = array('name' => $packageName); + $expected = array('name' => $expectedName); + + $actual = $installer->inflectPackageVars($vars); + + $this->assertEquals($actual, $expected); + } + + /** + * Provides various names for packages and the expected result after inflection + * + * @return array + */ + final public function provideExpectedInflectionResults() + { + return array( + // lowercase + array('foo', 'foo'), + array('craftfoo', 'craftfoo'), + array('fooplugin', 'fooplugin'), + array('craftfooplugin', 'craftfooplugin'), + // lowercase - dash + array('craft-foo', 'foo'), + array('foo-plugin', 'foo'), + array('craft-foo-plugin', 'foo'), + // lowercase - underscore + array('craft_foo', 'craft_foo'), + array('foo_plugin', 'foo_plugin'), + array('craft_foo_plugin', 'craft_foo_plugin'), + // CamelCase + array('Foo', 'Foo'), + array('CraftFoo', 'CraftFoo'), + array('FooPlugin', 'FooPlugin'), + array('CraftFooPlugin', 'CraftFooPlugin'), + // CamelCase - Dash + array('Craft-Foo', 'Foo'), + array('Foo-Plugin', 'Foo'), + array('Craft-Foo-Plugin', 'Foo'), + // CamelCase - underscore + array('Craft_Foo', 'Craft_Foo'), + array('Foo_Plugin', 'Foo_Plugin'), + array('Craft_Foo_Plugin', 'Craft_Foo_Plugin'), + ); + } +} diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php index a516daf..610b8e6 100644 --- a/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php +++ b/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php @@ -92,6 +92,7 @@ public function dataForTestSupport() array('bitrix-module', true), array('bitrix-component', true), array('bitrix-theme', true), + array('bonefish-package', true), array('cakephp', false), array('cakephp-', false), array('cakephp-app', false), @@ -173,6 +174,8 @@ public function dataForTestSupport() array('zend-library', true), array('zikula-module', true), array('zikula-theme', true), + array('kodicms-plugin', true), + array('kodicms-media', true), ); } @@ -202,9 +205,10 @@ public function dataForTestInstallPath() array('annotatecms-module', 'addons/modules/my_module/', 'vysinsky/my_module'), array('annotatecms-component', 'addons/components/my_component/', 'vysinsky/my_component'), array('annotatecms-service', 'addons/services/my_service/', 'vysinsky/my_service'), - array('bitrix-module', 'local/modules/my_module/', 'author/my_module'), - array('bitrix-component', 'local/components/my_component/', 'author/my_component'), - array('bitrix-theme', 'local/templates/my_theme/', 'author/my_theme'), + array('bitrix-module', 'bitrix/modules/my_module/', 'author/my_module'), + array('bitrix-component', 'bitrix/components/my_component/', 'author/my_component'), + array('bitrix-theme', 'bitrix/templates/my_theme/', 'author/my_theme'), + array('bonefish-package', 'Packages/bonefish/package/', 'bonefish/package'), array('cakephp-plugin', 'Plugin/Ftp/', 'shama/ftp'), array('chef-cookbook', 'Chef/mre/my_cookbook/', 'mre/my_cookbook'), array('chef-role', 'Chef/roles/my_role/', 'mre/my_role'), @@ -297,6 +301,8 @@ public function dataForTestInstallPath() array('zend-extra', 'extras/library/zend_test/', 'shama/zend_test'), array('zikula-module', 'modules/my-test_module/', 'my/test_module'), array('zikula-theme', 'themes/my-test_theme/', 'my/test_theme'), + array('kodicms-media', 'cms/media/vendor/my_media/', 'shama/my_media'), + array('kodicms-plugin', 'cms/plugins/my_plugin/', 'shama/my_plugin'), ); } diff --git a/vendor/composer/semver/CHANGELOG.md b/vendor/composer/semver/CHANGELOG.md index 8352cb7..dd0ab51 100644 --- a/vendor/composer/semver/CHANGELOG.md +++ b/vendor/composer/semver/CHANGELOG.md @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +### [1.2.0] 2015-11-10 + + * Changed: allow multiple numerical identifiers in 'pre-release' version part. + * Changed: add more 'v' prefix support. + +### [1.1.0] 2015-11-03 + + * Changed: dropped redundant `test` namespace. + * Changed: minor adjustment in datetime parsing normalization. + * Changed: `ConstraintInterface` relaxed, setPrettyString is not required anymore. + * Changed: `AbstractConstraint` marked deprecated, will be removed in 2.0. + * Changed: `Constraint` is now extensible. + ### [1.0.0] 2015-09-21 * Break: `VersionConstraint` renamed to `Constraint`. @@ -13,7 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). * Changed: `VersionParser::parseConstraints` allows (but ignores) prefixing numeric versions with a 'v' now. * Changed: Fixed namespace(s) of test files. * Changed: `Comparator::compare` no longer throws `InvalidArgumentException`. - * Changed: `VersionConstraint` now throws `InvalidArgumentException`. + * Changed: `Constraint` now throws `InvalidArgumentException`. ### [0.1.0] 2015-07-23 @@ -26,3 +39,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Namespace: `Composer\Test\Package\Version` -> `Composer\Test\Semver` - Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint` * Changed: code style using php-cs-fixer. + +[1.2.0]: https://github.com/composer/semver/compare/1.1.0...1.2.0 +[1.1.0]: https://github.com/composer/semver/compare/1.0.0...1.1.0 +[1.0.0]: https://github.com/composer/semver/compare/0.1.0...1.0.0 +[0.1.0]: https://github.com/composer/semver/compare/5e0b9a4da...0.1.0 diff --git a/vendor/composer/semver/README.md b/vendor/composer/semver/README.md index c8b6979..bd2924f 100644 --- a/vendor/composer/semver/README.md +++ b/vendor/composer/semver/README.md @@ -56,7 +56,7 @@ Comparator::greaterThan('1.25.0', '1.24.0'); // 1.25.0 > 1.24.0 ### Semver -The `Composer\Semver\Semver` class providers the following methods: +The `Composer\Semver\Semver` class provides the following methods: * satisfies($version, $constraints) * satisfiedBy($constraint, array $versions) diff --git a/vendor/composer/semver/composer.json b/vendor/composer/semver/composer.json index b996186..b0400cd 100644 --- a/vendor/composer/semver/composer.json +++ b/vendor/composer/semver/composer.json @@ -22,7 +22,8 @@ }, { "name": "Rob Bast", - "email": "rob.bast@gmail.com" + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" } ], "support": { @@ -30,11 +31,11 @@ "issues": "https://github.com/composer/semver/issues" }, "require": { - "php": ">=5.3.2" + "php": "^5.3.2 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "~2.3" + "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" }, "autoload": { "psr-4": { @@ -43,12 +44,12 @@ }, "autoload-dev": { "psr-4": { - "Composer\\Semver\\Test\\": "tests" + "Composer\\Semver\\": "tests" } }, "extra": { "branch-alias": { - "dev-master": "0.1-dev" + "dev-master": "1.x-dev" } }, "scripts": { diff --git a/vendor/composer/semver/src/Constraint/AbstractConstraint.php b/vendor/composer/semver/src/Constraint/AbstractConstraint.php index ccd834f..be83f75 100644 --- a/vendor/composer/semver/src/Constraint/AbstractConstraint.php +++ b/vendor/composer/semver/src/Constraint/AbstractConstraint.php @@ -11,6 +11,8 @@ namespace Composer\Semver\Constraint; +trigger_error('The ' . __CLASS__ . ' abstract class is deprecated, there is no replacement for it, it will be removed in the next major version.', E_USER_DEPRECATED); + /** * Base constraint class. */ @@ -26,17 +28,13 @@ */ public function matches(ConstraintInterface $provider) { - if ($provider instanceof MultiConstraint) { - // turn matching around to find a match - return $provider->matches($this); - } - if ($provider instanceof $this) { // see note at bottom of this class declaration return $this->matchSpecific($provider); } - return true; + // turn matching around to find a match + return $provider->matches($this); } /** diff --git a/vendor/composer/semver/src/Constraint/Constraint.php b/vendor/composer/semver/src/Constraint/Constraint.php index 8bc68db..7a21eb4 100644 --- a/vendor/composer/semver/src/Constraint/Constraint.php +++ b/vendor/composer/semver/src/Constraint/Constraint.php @@ -14,7 +14,7 @@ /** * Defines a constraint. */ -class Constraint extends AbstractConstraint +class Constraint implements ConstraintInterface { /* operator integer values */ const OP_EQ = 0; @@ -55,10 +55,48 @@ class Constraint extends AbstractConstraint ); /** @var string */ - private $operator; + protected $operator; /** @var string */ - private $version; + protected $version; + + /** @var string */ + protected $prettyString; + + /** + * @param ConstraintInterface $provider + * + * @return bool + */ + public function matches(ConstraintInterface $provider) + { + if ($provider instanceof $this) { + return $this->matchSpecific($provider); + } + + // turn matching around to find a match + return $provider->matches($this); + } + + /** + * @param string $prettyString + */ + public function setPrettyString($prettyString) + { + $this->prettyString = $prettyString; + } + + /** + * @return string + */ + public function getPrettyString() + { + if ($this->prettyString) { + return $this->prettyString; + } + + return $this->__toString(); + } /** * Get all supported comparison operators. diff --git a/vendor/composer/semver/src/Constraint/ConstraintInterface.php b/vendor/composer/semver/src/Constraint/ConstraintInterface.php index 78c099c..7cb13b6 100644 --- a/vendor/composer/semver/src/Constraint/ConstraintInterface.php +++ b/vendor/composer/semver/src/Constraint/ConstraintInterface.php @@ -21,11 +21,6 @@ public function matches(ConstraintInterface $provider); /** - * @param string $prettyString - */ - public function setPrettyString($prettyString); - - /** * @return string */ public function getPrettyString(); diff --git a/vendor/composer/semver/src/VersionParser.php b/vendor/composer/semver/src/VersionParser.php index 269aee9..d932f94 100644 --- a/vendor/composer/semver/src/VersionParser.php +++ b/vendor/composer/semver/src/VersionParser.php @@ -23,13 +23,23 @@ */ class VersionParser { - /** @var string */ - private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?'; + /** + * Regex to match pre-release data (sort of). + * + * Due to backwards compatibility: + * - Instead of enforcing hyphen, an underscore, dot or nothing at all are also accepted. + * - Only stabilities as recognized by Composer are allowed to precede a numerical identifier. + * - Numerical-only pre-release identifiers are not supported, see tests. + * + * |--------------| + * [major].[minor].[patch] -[pre-release] +[build-metadata] + * + * @var string + */ + private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)((?:[.-]?\d+)*+)?)?([.-]?dev)?'; /** @var array */ - private static $stabilities = array( - 'stable', 'RC', 'beta', 'alpha', 'dev', - ); + private static $stabilities = array('stable', 'RC', 'beta', 'alpha', 'dev'); /** * Returns the stability of a version. @@ -96,12 +106,12 @@ public function normalize($version, $fullVersion = null) } // strip off aliasing - if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) { + if (preg_match('{^([^,\s]++) ++as ++([^,\s]++)$}', $version, $match)) { $version = $match[1]; } // strip off build metadata - if (preg_match('{^([^,\s+]+)\+[^\s]+$}', $version, $match)) { + if (preg_match('{^([^,\s+]++)\+[^\s]++$}', $version, $match)) { $version = $match[1]; } @@ -115,7 +125,7 @@ public function normalize($version, $fullVersion = null) } // match classical versioning - if (preg_match('{^v?(\d{1,5})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { + if (preg_match('{^v?(\d{1,5})(\.\d++)?(\.\d++)?(\.\d++)?' . self::$modifierRegex . '$}i', $version, $matches)) { $version = $matches[1] . (!empty($matches[2]) ? $matches[2] : '.0') . (!empty($matches[3]) ? $matches[3] : '.0') @@ -123,7 +133,7 @@ public function normalize($version, $fullVersion = null) $index = 5; // match date(time) based versioning } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { - $version = preg_replace('{\D}', '-', $matches[1]); + $version = preg_replace('{\D}', '.', $matches[1]); $index = 2; } @@ -133,7 +143,7 @@ public function normalize($version, $fullVersion = null) if ('stable' === $matches[$index]) { return $version; } - $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); + $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? ltrim($matches[$index + 1], '.-') : ''); } if (!empty($matches[$index + 2])) { @@ -170,7 +180,7 @@ public function normalize($version, $fullVersion = null) */ public function parseNumericAliasPrefix($branch) { - if (preg_match('{^(?P(\d+\\.)*\d+)(?:\.x)?-dev$}i', $branch, $matches)) { + if (preg_match('{^(?P(\d++\\.)*\d++)(?:\.x)?-dev$}i', $branch, $matches)) { return $matches['version'] . '.'; } @@ -192,7 +202,7 @@ public function normalizeBranch($name) return $this->normalize($name); } - if (preg_match('{^v?(\d+)(\.(?:\d+|[xX*]))?(\.(?:\d+|[xX*]))?(\.(?:\d+|[xX*]))?$}i', $name, $matches)) { + if (preg_match('{^v?(\d++)(\.(?:\d++|[xX*]))?(\.(?:\d++|[xX*]))?(\.(?:\d++|[xX*]))?$}i', $name, $matches)) { $version = ''; for ($i = 1; $i < 5; ++$i) { $version .= isset($matches[$i]) ? str_replace(array('*', 'X'), 'x', $matches[$i]) : '.x'; @@ -205,7 +215,7 @@ public function normalizeBranch($name) } /** - * Parses as constraint string into LinkConstraint objects. + * Parses a constraint string into MultiConstraint and/or Constraint objects. * * @param string $constraints * @@ -274,11 +284,11 @@ private function parseConstraint($constraint) } } - if (preg_match('{^[xX*](\.[xX*])*$}i', $constraint)) { + if (preg_match('{^v?[xX*](\.[xX*])*$}i', $constraint)) { return array(new EmptyConstraint()); } - $versionRegex = 'v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?' . self::$modifierRegex . '(?:\+[^\s]+)?'; + $versionRegex = 'v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.(\d++))?' . self::$modifierRegex . '(?:\+[^\s]+)?'; // Tilde Range // @@ -372,7 +382,7 @@ private function parseConstraint($constraint) // // Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple. // A partial version range is treated as an X-Range, so the special character is in fact optional. - if (preg_match('{^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.[xX*])+$}', $constraint, $matches)) { + if (preg_match('{^v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.[xX*])++$}', $constraint, $matches)) { if (isset($matches[3]) && '' !== $matches[3]) { $position = 3; } elseif (isset($matches[2]) && '' !== $matches[2]) { diff --git a/vendor/doctrine/cache/.travis.yml b/vendor/doctrine/cache/.travis.yml index 2952a48..5668a81 100644 --- a/vendor/doctrine/cache/.travis.yml +++ b/vendor/doctrine/cache/.travis.yml @@ -1,11 +1,19 @@ language: php +sudo: false + +cache: + directories: + - vendor + - $HOME/.composer/cache + php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - hhvm + - 5.3 + - 5.4 + - 5.5 + - 5.6 + - 7.0 + - hhvm services: - riak @@ -14,13 +22,13 @@ services: - redis-server before_install: - - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then pecl install riak-beta; fi" - - sh -c "if [[ $TRAVIS_PHP_VERSION != 'hhvm' && `php-config --vernum` -ge 50500 ]] ; then pecl config-set preferred_state beta; printf "yes\n" | pecl install apcu ; else echo 'extension="apc.so"' >> ./tests/travis/php.ini ;fi" - - composer self-update - - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php.ini; fi" + - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then pecl install riak-beta; fi; + - if [[ $TRAVIS_PHP_VERSION =~ 5.[34] ]] ; then echo 'extension="apc.so"' >> ./tests/travis/php.ini; fi; + - if [[ $TRAVIS_PHP_VERSION =~ 5.[56] ]] ; then pecl config-set preferred_state beta; printf "yes\n" | pecl install apcu; fi; + - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis/php.ini; fi; install: - - composer --prefer-source --dev install + - travis_retry composer install script: - ./vendor/bin/phpunit -c ./tests/travis/phpunit.travis.xml -v @@ -29,5 +37,6 @@ after_script: - php vendor/bin/coveralls -v matrix: - allow_failures: - - php: hhvm + fast_finish: true + allow_failures: + - php: hhvm diff --git a/vendor/doctrine/cache/LICENSE b/vendor/doctrine/cache/LICENSE index 4a91f0b..8c38cc1 100644 --- a/vendor/doctrine/cache/LICENSE +++ b/vendor/doctrine/cache/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2006-2012 Doctrine Project +Copyright (c) 2006-2015 Doctrine Project 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 diff --git a/vendor/doctrine/cache/composer.json b/vendor/doctrine/cache/composer.json index f3caa7a..bd7a7ec 100644 --- a/vendor/doctrine/cache/composer.json +++ b/vendor/doctrine/cache/composer.json @@ -24,7 +24,10 @@ "doctrine/common": ">2.2,<2.4" }, "autoload": { - "psr-0": { "Doctrine\\Common\\Cache\\": "lib/" } + "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" } + }, + "autoload-dev": { + "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" } }, "extra": { "branch-alias": { diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php index abd5e71..036583e 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php @@ -53,7 +53,7 @@ protected function doContains($id) */ protected function doSave($id, $data, $lifeTime = 0) { - return (bool) apc_store($id, $data, (int) $lifeTime); + return apc_store($id, $data, $lifeTime); } /** @@ -61,7 +61,8 @@ protected function doSave($id, $data, $lifeTime = 0) */ protected function doDelete($id) { - return apc_delete($id); + // apc_delete returns false if the id does not exist + return apc_delete($id) || ! apc_exists($id); } /** diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php index 205a123..89fe323 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php @@ -59,19 +59,22 @@ public function fetch($id); * * @param string $id The cache id of the entry to check for. * - * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise. + * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise. */ public function contains($id); /** * Puts data into the cache. * + * If a cache entry with the given id already exists, its data will be replaced. + * * @param string $id The cache id. * @param mixed $data The cache entry/data. - * @param int $lifeTime The cache lifetime. - * If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime). + * @param int $lifeTime The lifetime in number of seconds for this cache entry. + * If zero (the default), the entry never expires (although it may be deleted from the cache + * to make place for other entries). * - * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise. + * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise. */ public function save($id, $data, $lifeTime = 0); @@ -80,7 +83,8 @@ public function save($id, $data, $lifeTime = 0); * * @param string $id The cache id. * - * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise. + * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise. + * Deleting a non-existing entry is considered successful. */ public function delete($id); diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php index a172a4c..cc7053a 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php @@ -83,6 +83,10 @@ public function fetch($id) */ public function fetchMultiple(array $keys) { + if (empty($keys)) { + return array(); + } + // note: the array_combine() is in place to keep an association between our $keys and the $namespacedKeys $namespacedKeys = array_combine($keys, array_map(array($this, 'getNamespacedId'), $keys)); $items = $this->doFetchMultiple($namespacedKeys); @@ -91,7 +95,7 @@ public function fetchMultiple(array $keys) // no internal array function supports this sort of mapping: needs to be iterative // this filters and combines keys in one pass foreach ($namespacedKeys as $requestedKey => $namespacedKey) { - if (isset($items[$namespacedKey])) { + if (isset($items[$namespacedKey]) || array_key_exists($namespacedKey, $items)) { $foundItems[$requestedKey] = $items[$namespacedKey]; } } @@ -147,9 +151,13 @@ public function deleteAll() $namespaceCacheKey = $this->getNamespaceCacheKey(); $namespaceVersion = $this->getNamespaceVersion() + 1; - $this->namespaceVersion = $namespaceVersion; + if ($this->doSave($namespaceCacheKey, $namespaceVersion)) { + $this->namespaceVersion = $namespaceVersion; + + return true; + } - return $this->doSave($namespaceCacheKey, $namespaceVersion); + return false; } /** @@ -188,15 +196,7 @@ private function getNamespaceVersion() } $namespaceCacheKey = $this->getNamespaceCacheKey(); - $namespaceVersion = $this->doFetch($namespaceCacheKey); - - if (false === $namespaceVersion) { - $namespaceVersion = 1; - - $this->doSave($namespaceCacheKey, $namespaceVersion); - } - - $this->namespaceVersion = $namespaceVersion; + $this->namespaceVersion = $this->doFetch($namespaceCacheKey) ?: 1; return $this->namespaceVersion; } @@ -225,7 +225,7 @@ protected function doFetchMultiple(array $keys) * * @param string $id The id of the cache entry to fetch. * - * @return mixed|boolean The cached data or FALSE, if no cache entry exists for the given id. + * @return mixed|false The cached data or FALSE, if no cache entry exists for the given id. */ abstract protected function doFetch($id); @@ -234,7 +234,7 @@ protected function doFetchMultiple(array $keys) * * @param string $id The cache id of the entry to check for. * - * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise. + * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise. */ abstract protected function doContains($id); @@ -246,7 +246,7 @@ protected function doFetchMultiple(array $keys) * @param int $lifeTime The lifetime. If != 0, sets a specific lifetime for this * cache entry (0 => infinite lifeTime). * - * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise. + * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise. */ abstract protected function doSave($id, $data, $lifeTime = 0); @@ -255,14 +255,14 @@ protected function doFetchMultiple(array $keys) * * @param string $id The cache id. * - * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise. + * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise. */ abstract protected function doDelete($id); /** * Flushes all cache entries. * - * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise. + * @return bool TRUE if the cache entries were successfully flushed, FALSE otherwise. */ abstract protected function doFlush(); diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php index d7b4358..3a91eaf 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php @@ -34,7 +34,7 @@ /** * Deletes all cache entries in the current cache namespace. * - * @return boolean TRUE if the cache entries were successfully deleted, FALSE otherwise. + * @return bool TRUE if the cache entries were successfully deleted, FALSE otherwise. */ public function deleteAll(); } diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php index 9ad3ce2..6aa2712 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php @@ -24,6 +24,7 @@ * * @since 2.3 * @author Fabio B. Silva + * @author Tobias Schultze */ abstract class FileCache extends CacheProvider { @@ -42,19 +43,6 @@ private $extension; /** - * @var string[] regular expressions for replacing disallowed characters in file name - */ - private $disallowedCharacterPatterns = array( - '/\-/', // replaced to disambiguate original `-` and `-` derived from replacements - '/[^a-zA-Z0-9\-_\[\]]/' // also excludes non-ascii chars (not supported, depending on FS) - ); - - /** - * @var string[] replacements for disallowed file characters - */ - private $replacementCharacters = array('__', '-'); - - /** * @var int */ private $umask; @@ -110,7 +98,7 @@ public function getDirectory() /** * Gets the cache file extension. * - * @return string|null + * @return string */ public function getExtension() { @@ -124,11 +112,23 @@ public function getExtension() */ protected function getFilename($id) { + $hash = hash('sha256', $id); + + // This ensures that the filename is unique and that there are no invalid chars in it. + if ('' === $id || strlen($id) > ((255 - strlen($this->extension)) / 2)) { + // Most filesystems have a limit of 255 chars for each path component. So if the id in hex representation + // plus the extension would surpass the limit, we use the hash instead. The prefix prevents collisions + // between the hash and bin2hex. + $filename = '_' . $hash; + } else { + $filename = bin2hex($id); + } + return $this->directory . DIRECTORY_SEPARATOR - . implode(str_split(hash('sha256', $id), 2), DIRECTORY_SEPARATOR) + . substr($hash, 0, 2) . DIRECTORY_SEPARATOR - . preg_replace($this->disallowedCharacterPatterns, $this->replacementCharacters, $id) + . $filename . $this->extension; } @@ -137,7 +137,9 @@ protected function getFilename($id) */ protected function doDelete($id) { - return @unlink($this->getFilename($id)); + $filename = $this->getFilename($id); + + return @unlink($filename) || ! file_exists($filename); } /** @@ -146,7 +148,16 @@ protected function doDelete($id) protected function doFlush() { foreach ($this->getIterator() as $name => $file) { - @unlink($name); + if ($file->isDir()) { + // Remove the intermediate directories which have been created to balance the tree. It only takes effect + // if the directory is empty. If several caches share the same directory but with different file extensions, + // the other ones are not removed. + @rmdir($name); + } elseif ($this->isFilenameEndingWithExtension($name)) { + // If an extension is set, only remove files which end with the given extension. + // If no extension is set, we have no other choice than removing everything. + @unlink($name); + } } return true; @@ -158,8 +169,10 @@ protected function doFlush() protected function doGetStats() { $usage = 0; - foreach ($this->getIterator() as $file) { - $usage += $file->getSize(); + foreach ($this->getIterator() as $name => $file) { + if (! $file->isDir() && $this->isFilenameEndingWithExtension($name)) { + $usage += $file->getSize(); + } } $free = disk_free_space($this->directory); @@ -229,9 +242,20 @@ protected function writeFile($filename, $content) */ private function getIterator() { - return new \RegexIterator( - new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory)), - '/^.+' . preg_quote($this->extension, '/') . '$/i' + return new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS), + \RecursiveIteratorIterator::CHILD_FIRST ); } + + /** + * @param string $name The filename + * + * @return bool + */ + private function isFilenameEndingWithExtension($name) + { + return '' === $this->extension + || strrpos($name, $this->extension) === (strlen($name) - strlen($this->extension)); + } } diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php index 29d5e07..d988294 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php @@ -53,7 +53,7 @@ protected function doFetch($id) $resource = fopen($filename, "r"); if (false !== ($line = fgets($resource))) { - $lifetime = (integer) $line; + $lifetime = (int) $line; } if ($lifetime !== 0 && $lifetime < time()) { @@ -86,7 +86,7 @@ protected function doContains($id) $resource = fopen($filename, "r"); if (false !== ($line = fgets($resource))) { - $lifetime = (integer) $line; + $lifetime = (int) $line; } fclose($resource); diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php index e4e606b..4311d4f 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php @@ -31,7 +31,7 @@ /** * Flushes all cache entries, globally. * - * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise. + * @return bool TRUE if the cache entries were successfully flushed, FALSE otherwise. */ public function flushAll(); } diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php index c5098fd..8afaeea 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php @@ -97,7 +97,8 @@ protected function doSave($id, $data, $lifeTime = 0) */ protected function doDelete($id) { - return $this->memcache->delete($id); + // Memcache::delete() returns false if entry does not exist + return $this->memcache->delete($id) || ! $this->doContains($id); } /** diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php index 040c26c..deebe5a 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php @@ -82,7 +82,8 @@ protected function doFetchMultiple(array $keys) */ protected function doContains($id) { - return (false !== $this->memcached->get($id)); + return false !== $this->memcached->get($id) + || $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND; } /** @@ -101,7 +102,8 @@ protected function doSave($id, $data, $lifeTime = 0) */ protected function doDelete($id) { - return $this->memcached->delete($id); + return $this->memcached->delete($id) + || $this->memcached->getResultCode() === Memcached::RES_NOTFOUND; } /** diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php index 0c7ac0a..a268a5b 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php @@ -41,7 +41,7 @@ class MongoDBCache extends CacheProvider * cache entry should expire. * * With MongoDB 2.2+, entries can be automatically deleted by MongoDB by - * indexing this field wit the "expireAfterSeconds" option equal to zero. + * indexing this field with the "expireAfterSeconds" option equal to zero. * This will direct MongoDB to regularly query for and delete any entries * whose date is older than the current time. Entries without a date value * in this field will be ignored. @@ -138,7 +138,7 @@ protected function doDelete($id) { $result = $this->collection->remove(array('_id' => $id)); - return isset($result['n']) ? $result['n'] == 1 : true; + return isset($result['ok']) ? $result['ok'] == 1 : true; } /** @@ -170,8 +170,8 @@ protected function doGetStats() return array( Cache::STATS_HITS => null, Cache::STATS_MISSES => null, - Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (integer) $serverStatus['uptime'] : null), - Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (integer) $collStats['size'] : null), + Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (int) $serverStatus['uptime'] : null), + Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (int) $collStats['size'] : null), Cache::STATS_MEMORY_AVAILABLE => null, ); } @@ -180,7 +180,8 @@ protected function doGetStats() * Check if the document is expired. * * @param array $document - * @return boolean + * + * @return bool */ private function isExpired(array $document) { diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php index 823477e..e7da2a6 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php @@ -2,7 +2,7 @@ namespace Doctrine\Common\Cache; -use Predis\Client; +use Predis\ClientInterface; /** * Predis cache provider. @@ -12,16 +12,16 @@ class PredisCache extends CacheProvider { /** - * @var Client + * @var ClientInterface */ private $client; /** - * @param Client $client + * @param ClientInterface $client * * @return void */ - public function __construct(Client $client) + public function __construct(ClientInterface $client) { $this->client = $client; } @@ -46,8 +46,9 @@ protected function doFetchMultiple(array $keys) { $fetchedItems = call_user_func_array(array($this->client, 'mget'), $keys); - return array_filter(array_combine($keys, array_map('unserialize', $fetchedItems))); + return array_map('unserialize', array_filter(array_combine($keys, $fetchedItems))); } + /** * {@inheritdoc} */ @@ -76,7 +77,7 @@ protected function doSave($id, $data, $lifeTime = 0) */ protected function doDelete($id) { - return $this->client->del($id) > 0; + return $this->client->del($id) >= 0; } /** diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php index 50d7c91..c64890e 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php @@ -71,7 +71,14 @@ protected function doFetch($id) */ protected function doFetchMultiple(array $keys) { - return array_filter(array_combine($keys, $this->redis->mget($keys))); + $fetchedItems = $this->redis->mget($keys); + + return array_filter( + array_combine($keys, $fetchedItems), + function ($value) { + return $value !== false; + } + ); } /** @@ -99,7 +106,7 @@ protected function doSave($id, $data, $lifeTime = 0) */ protected function doDelete($id) { - return $this->redis->delete($id) > 0; + return $this->redis->delete($id) >= 0; } /** diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php index 8bb6b4b..0baa3f2 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php @@ -202,7 +202,7 @@ protected function doGetStats() * * @param \Riak\Object $object * - * @return boolean + * @return bool */ private function isExpired(Object $object) { diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php index b12978c..0bf6e4d 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php @@ -98,7 +98,7 @@ protected function doFetch($id) */ protected function doContains($id) { - return (boolean) $this->findById($id, false); + return null !== $this->findById($id, false); } /** @@ -157,7 +157,7 @@ protected function doGetStats() * Find a single row by ID. * * @param mixed $id - * @param boolean $includeData + * @param bool $includeData * * @return array|null */ @@ -208,7 +208,8 @@ private function getFields() * Check if the item is expired. * * @param array $item - * @return boolean + * + * @return bool */ private function isExpired(array $item) { diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php index d742fa0..eeab125 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php @@ -21,5 +21,5 @@ class Version { - const VERSION = '1.4.0-DEV'; + const VERSION = '1.5.1'; } diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php index ae32772..6f563aa 100644 --- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php +++ b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php @@ -53,7 +53,7 @@ protected function doContains($id) */ protected function doSave($id, $data, $lifeTime = 0) { - return (bool) wincache_ucache_set($id, $data, (int) $lifeTime); + return wincache_ucache_set($id, $data, $lifeTime); } /** @@ -75,6 +75,14 @@ protected function doFlush() /** * {@inheritdoc} */ + protected function doFetchMultiple(array $keys) + { + return wincache_ucache_get($keys); + } + + /** + * {@inheritdoc} + */ protected function doGetStats() { $info = wincache_ucache_info(); diff --git a/vendor/doctrine/cache/phpunit.xml.dist b/vendor/doctrine/cache/phpunit.xml.dist index 34d7f4c..e3401f2 100644 --- a/vendor/doctrine/cache/phpunit.xml.dist +++ b/vendor/doctrine/cache/phpunit.xml.dist @@ -1,16 +1,19 @@ - + + + + ./tests/Doctrine/ diff --git a/vendor/doctrine/inflector/.travis.yml b/vendor/doctrine/inflector/.travis.yml index 6b1d8ff..9ec68f7 100644 --- a/vendor/doctrine/inflector/.travis.yml +++ b/vendor/doctrine/inflector/.travis.yml @@ -1,11 +1,21 @@ language: php +sudo: false + +cache: + directory: + - $HOME/.composer/cache + php: - 5.3 - 5.4 - 5.5 - 5.6 + - 7.0 - hhvm install: - - composer --prefer-source install + - composer install -n + +script: + - phpunit diff --git a/vendor/doctrine/inflector/LICENSE b/vendor/doctrine/inflector/LICENSE index 5e781fc..8c38cc1 100644 --- a/vendor/doctrine/inflector/LICENSE +++ b/vendor/doctrine/inflector/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2006-2013 Doctrine Project +Copyright (c) 2006-2015 Doctrine Project 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 diff --git a/vendor/doctrine/inflector/composer.json b/vendor/doctrine/inflector/composer.json index a29c68c..7e5b2ef 100644 --- a/vendor/doctrine/inflector/composer.json +++ b/vendor/doctrine/inflector/composer.json @@ -23,7 +23,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } } } diff --git a/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php b/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php index b007b21..a53828a 100644 --- a/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php +++ b/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php @@ -56,11 +56,12 @@ class Inflector '/(p)erson$/i' => '\1eople', '/(m)an$/i' => '\1en', '/(c)hild$/i' => '\1hildren', - '/(buffal|tomat)o$/i' => '\1\2oes', + '/(f)oot$/i' => '\1eet', + '/(buffal|her|potat|tomat|volcan)o$/i' => '\1\2oes', '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i', '/us$/i' => 'uses', '/(alias)$/i' => '\1es', - '/(ax|cris|test)is$/i' => '\1es', + '/(analys|ax|cris|test|thes)is$/i' => '\1es', '/s$/' => 's', '/^$/' => '', '/$/' => 's', @@ -70,27 +71,42 @@ class Inflector ), 'irregular' => array( 'atlas' => 'atlases', + 'axe' => 'axes', 'beef' => 'beefs', 'brother' => 'brothers', 'cafe' => 'cafes', + 'chateau' => 'chateaux', 'child' => 'children', 'cookie' => 'cookies', 'corpus' => 'corpuses', 'cow' => 'cows', - 'criteria' => 'criterion', + 'criterion' => 'criteria', + 'curriculum' => 'curricula', + 'demo' => 'demos', + 'domino' => 'dominoes', + 'echo' => 'echoes', + 'foot' => 'feet', + 'fungus' => 'fungi', 'ganglion' => 'ganglions', 'genie' => 'genies', 'genus' => 'genera', 'graffito' => 'graffiti', + 'hippopotamus' => 'hippopotami', 'hoof' => 'hoofs', 'human' => 'humans', + 'iris' => 'irises', + 'leaf' => 'leaves', 'loaf' => 'loaves', 'man' => 'men', + 'medium' => 'media', + 'memorandum' => 'memoranda', 'money' => 'monies', 'mongoose' => 'mongooses', + 'motto' => 'mottoes', 'move' => 'moves', 'mythos' => 'mythoi', 'niche' => 'niches', + 'nucleus' => 'nuclei', 'numen' => 'numina', 'occiput' => 'occiputs', 'octopus' => 'octopuses', @@ -98,11 +114,19 @@ class Inflector 'ox' => 'oxen', 'penis' => 'penises', 'person' => 'people', + 'plateau' => 'plateaux', + 'runner-up' => 'runners-up', 'sex' => 'sexes', 'soliloquy' => 'soliloquies', + 'son-in-law' => 'sons-in-law', + 'syllabus' => 'syllabi', 'testis' => 'testes', + 'thief' => 'thieves', + 'tooth' => 'teeth', + 'tornado' => 'tornadoes', 'trilby' => 'trilbys', 'turf' => 'turfs', + 'volcano' => 'volcanoes', ) ); @@ -120,9 +144,10 @@ class Inflector '/(vert|ind)ices$/i' => '\1ex', '/^(ox)en/i' => '\1', '/(alias)(es)*$/i' => '\1', + '/(buffal|her|potat|tomat|volcan)oes$/i' => '\1o', '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us', '/([ftw]ax)es/i' => '\1', - '/(cris|ax|test)es$/i' => '\1is', + '/(analys|ax|cris|test|thes)es$/i' => '\1is', '/(shoe|slave)s$/i' => '\1', '/(o)es$/i' => '\1', '/ouses$/' => 'ouse', @@ -143,6 +168,7 @@ class Inflector '/(p)eople$/i' => '\1\2erson', '/(m)en$/i' => '\1an', '/(c)hildren$/i' => '\1\2hild', + '/(f)eet$/i' => '\1oot', '/(n)ews$/i' => '\1\2ews', '/eaus$/' => 'eau', '/^(.*us)$/' => '\\1', @@ -159,10 +185,15 @@ class Inflector '.*ss', ), 'irregular' => array( - 'criterion' => 'criteria', - 'curves' => 'curve', - 'foes' => 'foe', - 'waves' => 'wave', + 'criteria' => 'criterion', + 'curves' => 'curve', + 'emphases' => 'emphasis', + 'foes' => 'foe', + 'hoaxes' => 'hoax', + 'media' => 'medium', + 'neuroses' => 'neurosis', + 'waves' => 'wave', + 'oases' => 'oasis', ) ); @@ -237,6 +268,42 @@ public static function camelize($word) } /** + * Uppercases words with configurable delimeters between words. + * + * Takes a string and capitalizes all of the words, like PHP's built-in + * ucwords function. This extends that behavior, however, by allowing the + * word delimeters to be configured, rather than only separating on + * whitespace. + * + * Here is an example: + * + * + * + * + * @param string $string The string to operate on. + * @param string $delimiters A list of word separators. + * + * @return string The string with all delimeter-separated words capitalized. + */ + public static function ucwords($string, $delimiters = " \n\t\r\0\x0B-") + { + return preg_replace_callback( + '/[^' . preg_quote($delimiters, '/') . ']+/', + function($matches) { + return ucfirst($matches[0]); + }, + $string + ); + } + + /** * Clears Inflectors inflected value caches, and resets the inflection * rules to the initial values. * diff --git a/vendor/egulias/email-validator/README.md b/vendor/egulias/email-validator/README.md index 262693b..0d0c5cc 100644 --- a/vendor/egulias/email-validator/README.md +++ b/vendor/egulias/email-validator/README.md @@ -9,7 +9,7 @@ With the help of Run the command below to install via Composer ```shell -composer require egulias/email-validator +composer require egulias/email-validator "~1.2" ``` ##Usage## diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php index d8522ff..882c968 100644 --- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php +++ b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php @@ -67,8 +67,6 @@ class EmailLexer extends AbstractLexer "\n" => self::S_LF, "\r\n" => self::CRLF, 'IPv6' => self::S_IPV6TAG, - '<' => self::S_LOWERTHAN, - '>' => self::S_GREATERTHAN, '{' => self::S_OPENQBRACKET, '}' => self::S_CLOSEQBRACKET, '' => self::S_EMPTY, diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php index d047dec..7e2b65f 100644 --- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php +++ b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php @@ -33,6 +33,7 @@ class EmailValidator const ERR_FWS_CRLF_END = 149; const ERR_CR_NO_LF = 150; const ERR_DEPREC_REACHED = 151; + const ERR_UNOPENEDCOMMENT = 152; const RFC5321_TLD = 9; const RFC5321_TLDNUMERIC = 10; const RFC5321_QUOTEDSTRING = 11; diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php index c4d0cf6..ba3a613 100644 --- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php +++ b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php @@ -4,7 +4,6 @@ namespace Egulias\EmailValidator\Parser; use Egulias\EmailValidator\EmailLexer; -use Egulias\EmailValidator\Parser\Parser; use Egulias\EmailValidator\EmailValidator; class DomainPart extends Parser @@ -103,8 +102,9 @@ public function checkIPV6Tag($addressLiteral, $maxGroups = 8) protected function doParseDomainPart() { $domain = ''; + $openedParenthesis = 0; + $openBrackets = false; do { - $prev = $this->lexer->getPrevious(); if ($this->lexer->token['type'] === EmailLexer::S_SLASH) { @@ -113,13 +113,25 @@ protected function doParseDomainPart() if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) { $this->parseComments(); + $openedParenthesis += $this->getOpenedParenthesis(); $this->lexer->moveNext(); + $tmpPrev = $this->lexer->getPrevious(); + if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) { + $openedParenthesis--; + } + } + if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) { + if ($openedParenthesis === 0) { + throw new \InvalidArgumentException('ERR_UNOPENEDCOMMENT'); + } else { + $openedParenthesis--; + } } $this->checkConsecutiveDots(); $this->checkDomainPartExceptions($prev); - if ($this->hasBrackets()) { + if ($openBrackets = $this->hasBrackets($openBrackets)) { $this->parseDomainLiteral(); } @@ -180,7 +192,7 @@ protected function doParseDomainLiteral() } if ($this->lexer->isNextToken(EmailLexer::S_CR)) { - throw new \InvalidArgumentException("ERR_CR_NO_LF"); + throw new \InvalidArgumentException('ERR_CR_NO_LF'); } if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) { $this->warnings[] = EmailValidator::RFC5322_DOMLIT_OBSDTEXT; @@ -276,8 +288,12 @@ protected function checkDomainPartExceptions($prev) } } - protected function hasBrackets() + protected function hasBrackets($openBrackets) { + if ($this->lexer->token['type'] === EmailLexer::S_CLOSEBRACKET && !$openBrackets) { + throw new \InvalidArgumentException('ERR_EXPECTING_OPENBRACKET'); + } + if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) { return false; } diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php index 2f77164..449748f 100644 --- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php +++ b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php @@ -4,7 +4,6 @@ use Egulias\EmailValidator\EmailLexer; use Egulias\EmailValidator\EmailValidator; -use \InvalidArgumentException; class LocalPart extends Parser { @@ -12,9 +11,9 @@ public function parse($localPart) { $parseDQuote = true; $closingQuote = false; + $openedParenthesis = 0; while ($this->lexer->token['type'] !== EmailLexer::S_AT && $this->lexer->token) { - if ($this->lexer->token['type'] === EmailLexer::S_DOT && !$this->lexer->getPrevious()) { throw new \InvalidArgumentException('ERR_DOT_START'); } @@ -26,12 +25,19 @@ public function parse($localPart) if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) { $this->parseComments(); + $openedParenthesis += $this->getOpenedParenthesis(); + } + if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) { + if ($openedParenthesis === 0) { + throw new \InvalidArgumentException('ERR_UNOPENEDCOMMENT'); + } else { + $openedParenthesis--; + } } $this->checkConsecutiveDots(); - if ( - $this->lexer->token['type'] === EmailLexer::S_DOT && + if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_AT) ) { throw new \InvalidArgumentException('ERR_DOT_END'); @@ -82,7 +88,7 @@ protected function parseDoubleQuote() $this->lexer->moveNext(); if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) { - throw new InvalidArgumentException("ERR_EXPECTED_ATEXT"); + throw new \InvalidArgumentException('ERR_EXPECTED_ATEXT'); } } @@ -90,12 +96,12 @@ protected function parseDoubleQuote() if ($prev['type'] === EmailLexer::S_BACKSLASH) { if (!$this->checkDQUOTE(false)) { - throw new \InvalidArgumentException("ERR_UNCLOSED_DQUOTE"); + throw new \InvalidArgumentException('ERR_UNCLOSED_DQUOTE'); } } if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) { - throw new \InvalidArgumentException("ERR_EXPECED_AT"); + throw new \InvalidArgumentException('ERR_EXPECED_AT'); } return $parseAgain; diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php index b66279e..8a72cd1 100644 --- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php +++ b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php @@ -9,6 +9,7 @@ { protected $warnings = array(); protected $lexer; + protected $openedParenthesis = 0; public function __construct(EmailLexer $lexer) { @@ -20,7 +21,13 @@ public function getWarnings() return $this->warnings; } - abstract function parse($str); + abstract public function parse($str); + + /** @return int */ + public function getOpenedParenthesis() + { + return $this->openedParenthesis; + } /** * validateQuotedPair @@ -35,15 +42,15 @@ protected function validateQuotedPair() $this->warnings[] = EmailValidator::DEPREC_QP; } - /** - * @return string the the comment - * @throws \InvalidArgumentException - */ protected function parseComments() { + $this->openedParenthesis = 1; $this->isUnclosedComment(); $this->warnings[] = EmailValidator::CFWS_COMMENT; while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) { + if ($this->lexer->isNextToken(EmailLexer::S_OPENPARENTHESIS)) { + $this->openedParenthesis++; + } $this->warnEscaping(); $this->lexer->moveNext(); } @@ -75,11 +82,11 @@ protected function parseFWS() $this->checkCRLFInFWS(); if ($this->lexer->token['type'] === EmailLexer::S_CR) { - throw new \InvalidArgumentException("ERR_CR_NO_LF"); + throw new \InvalidArgumentException('ERR_CR_NO_LF'); } if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] !== EmailLexer::S_AT) { - throw new \InvalidArgumentException("ERR_ATEXT_AFTER_CFWS"); + throw new \InvalidArgumentException('ERR_ATEXT_AFTER_CFWS'); } if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) { @@ -160,7 +167,7 @@ protected function checkDQUOTE($hasClosingQuote) return $hasClosingQuote; } $previous = $this->lexer->getPrevious(); - if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) { + if ($previous['type'] === EmailLexer::GENERIC && $this->lexer->isNextToken(EmailLexer::GENERIC)) { throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT'); } @@ -181,10 +188,10 @@ protected function checkCRLFInFWS() return; } if ($this->lexer->isNextToken(EmailLexer::CRLF)) { - throw new \InvalidArgumentException("ERR_FWS_CRLF_X2"); + throw new \InvalidArgumentException('ERR_FWS_CRLF_X2'); } if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) { - throw new \InvalidArgumentException("ERR_FWS_CRLF_END"); + throw new \InvalidArgumentException('ERR_FWS_CRLF_END'); } } } diff --git a/vendor/fabpot/goutte/composer.json b/vendor/fabpot/goutte/composer.json index 1a0ed82..a5d3d66 100644 --- a/vendor/fabpot/goutte/composer.json +++ b/vendor/fabpot/goutte/composer.json @@ -13,9 +13,9 @@ ], "require": { "php": ">=5.5.0", - "symfony/browser-kit": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1", + "symfony/browser-kit": "~2.1|~3.0", + "symfony/css-selector": "~2.1|~3.0", + "symfony/dom-crawler": "~2.1|~3.0", "guzzlehttp/guzzle": "^6.0" }, "autoload": { diff --git a/vendor/guzzlehttp/guzzle/.travis.yml b/vendor/guzzlehttp/guzzle/.travis.yml index c0689d1..d2060f4 100644 --- a/vendor/guzzlehttp/guzzle/.travis.yml +++ b/vendor/guzzlehttp/guzzle/.travis.yml @@ -1,5 +1,7 @@ language: php +sudo: false + php: - 5.5 - 5.6 diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md index de7da2d..5b7669b 100644 --- a/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md @@ -1,5 +1,20 @@ # CHANGELOG +## 6.1.1 - 2015-11-22 + +* Bug fix: Proxy::wrapSync() now correctly proxies to the appropriate handler + https://github.com/guzzle/guzzle/commit/911bcbc8b434adce64e223a6d1d14e9a8f63e4e4 +* Feature: HandlerStack is now more generic. + https://github.com/guzzle/guzzle/commit/f2102941331cda544745eedd97fc8fd46e1ee33e +* Bug fix: setting verify to false in the StreamHandler now disables peer + verification. https://github.com/guzzle/guzzle/issues/1256 +* Feature: Middleware now uses an exception factory, including more error + context. https://github.com/guzzle/guzzle/pull/1282 +* Feature: better support for disabled functions. + https://github.com/guzzle/guzzle/pull/1287 +* Bug fix: fixed regression where MockHandler was not using `sink`. + https://github.com/guzzle/guzzle/pull/1292 + ## 6.1.0 - 2015-09-08 * Feature: Added the `on_stats` request option to provide access to transfer diff --git a/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md index 2d721c0..3af1cc3 100644 --- a/vendor/guzzlehttp/guzzle/README.md +++ b/vendor/guzzlehttp/guzzle/README.md @@ -23,7 +23,7 @@ $res = $client->request('GET', 'https://api.github.com/user', [ 'auth' => ['user', 'pass'] ]); echo $res->getStatusCode(); -// "200" +// 200 echo $res->getHeader('content-type'); // 'application/json; charset=utf8' echo $res->getBody(); diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php index b5b2306..19068e1 100644 --- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -12,7 +12,7 @@ */ interface ClientInterface { - const VERSION = '6.1.0'; + const VERSION = '6.1.1'; /** * Send an HTTP request. diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php index ea60068..11421fe 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php @@ -82,7 +82,7 @@ public static function getCookieValue($value) * that survives between requests. * * @param SetCookie $cookie Being evaluated. - * @param bool $allowSessionCookies If we should presist session cookies + * @param bool $allowSessionCookies If we should persist session cookies * @return bool */ public static function shouldPersist( diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php index c55bb34..e4e6248 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php @@ -9,7 +9,7 @@ class FileCookieJar extends CookieJar /** @var string filename */ private $filename; - /** @var bool Control whether to presist session cookies or not. */ + /** @var bool Control whether to persist session cookies or not. */ private $storeSessionCookies; /** diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php index d80c480..9cd5f9e 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php @@ -9,7 +9,7 @@ class SessionCookieJar extends CookieJar /** @var string session key */ private $sessionKey; - /** @var bool Control whether to presist session cookies or not. */ + /** @var bool Control whether to persist session cookies or not. */ private $storeSessionCookies; /** diff --git a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php index 23dd02c..56b1831 100644 --- a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php +++ b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php @@ -79,25 +79,69 @@ public static function create( $level = floor($response->getStatusCode() / 100); if ($level == '4') { - $label = 'Client error response'; + $label = 'Client error'; $className = __NAMESPACE__ . '\\ClientException'; } elseif ($level == '5') { - $label = 'Server error response'; + $label = 'Server error'; $className = __NAMESPACE__ . '\\ServerException'; } else { - $label = 'Unsuccessful response'; + $label = 'Unsuccessful request'; $className = __CLASS__; } - $message = $label . ' [url] ' . $request->getUri() - . ' [http method] ' . $request->getMethod() - . ' [status code] ' . $response->getStatusCode() - . ' [reason phrase] ' . $response->getReasonPhrase(); + // Server Error: `GET /` resulted in a `404 Not Found` response: + // ... (truncated) + $message = sprintf( + '%s: `%s` resulted in a `%s` response', + $label, + $request->getMethod() . ' ' . $request->getUri(), + $response->getStatusCode() . ' ' . $response->getReasonPhrase() + ); + + $summary = static::getResponseBodySummary($response); + + if ($summary !== null) { + $message .= ":\n{$summary}\n"; + } return new $className($message, $request, $response, $previous, $ctx); } /** + * Get a short summary of the response + * + * Will return `null` if the response is not printable. + * + * @param ResponseInterface $response + * + * @return string|null + */ + public static function getResponseBodySummary(ResponseInterface $response) + { + $body = $response->getBody(); + + if (!$body->isSeekable()) { + return null; + } + + $size = $body->getSize(); + $summary = $body->read(120); + $body->rewind(); + + if ($size > 120) { + $summary .= ' (truncated...)'; + } + + // Matches any printable character, including unicode characters: + // letters, marks, numbers, punctuation, spacing, and separators. + if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/', $summary)) { + return null; + } + + return $summary; + } + + /** * Get the request that caused the exception * * @return RequestInterface diff --git a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php index 4b1b0af..cd7898f 100644 --- a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php +++ b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php @@ -87,6 +87,19 @@ function ($value) use ($request, $options) { if ($this->onFulfilled) { call_user_func($this->onFulfilled, $value); } + if (isset($options['sink'])) { + $contents = (string) $value->getBody(); + $sink = $options['sink']; + + if (is_resource($sink)) { + fwrite($sink, $contents); + } elseif (is_string($sink)) { + file_put_contents($sink, $contents); + } elseif ($sink instanceof \Psr\Http\Message\StreamInterface) { + $sink->write($contents); + } + } + return $value; }, function ($reason) use ($request, $options) { diff --git a/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php index 9bd76d2..f8b00be 100644 --- a/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php +++ b/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php @@ -1,6 +1,7 @@ cached) { - $this->cached = $this->resolve(); - } + $handler = $this->resolve(); - $handler = $this->cached; return $handler($request, $options); } @@ -193,15 +190,19 @@ function ($tuple) use ($idx, $remove) { */ public function resolve() { - if (!($prev = $this->handler)) { - throw new \LogicException('No handler has been specified'); - } + if (!$this->cached) { + if (!($prev = $this->handler)) { + throw new \LogicException('No handler has been specified'); + } + + foreach (array_reverse($this->stack) as $fn) { + $prev = $fn[0]($prev); + } - foreach (array_reverse($this->stack) as $fn) { - $prev = $fn[0]($prev); + $this->cached = $prev; } - return $prev; + return $this->cached; } /** diff --git a/vendor/guzzlehttp/guzzle/src/Middleware.php b/vendor/guzzlehttp/guzzle/src/Middleware.php index 2f165f3..85d3165 100644 --- a/vendor/guzzlehttp/guzzle/src/Middleware.php +++ b/vendor/guzzlehttp/guzzle/src/Middleware.php @@ -2,9 +2,7 @@ namespace GuzzleHttp; use GuzzleHttp\Cookie\CookieJarInterface; -use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\RequestException; -use GuzzleHttp\Exception\ServerException; use GuzzleHttp\Promise\RejectedPromise; use GuzzleHttp\Psr7; use Psr\Http\Message\ResponseInterface; @@ -64,9 +62,7 @@ function (ResponseInterface $response) use ($request, $handler) { if ($code < 400) { return $response; } - throw $code > 499 - ? new ServerException("Server error: $code", $request, $response) - : new ClientException("Client error: $code", $request, $response); + throw RequestException::create($request, $response); } ); }; diff --git a/vendor/guzzlehttp/guzzle/src/Pool.php b/vendor/guzzlehttp/guzzle/src/Pool.php index bc41d6e..8f1be33 100644 --- a/vendor/guzzlehttp/guzzle/src/Pool.php +++ b/vendor/guzzlehttp/guzzle/src/Pool.php @@ -52,11 +52,11 @@ public function __construct( $iterable = \GuzzleHttp\Promise\iter_for($requests); $requests = function () use ($iterable, $client, $opts) { - foreach ($iterable as $rfn) { + foreach ($iterable as $key => $rfn) { if ($rfn instanceof RequestInterface) { - yield $client->sendAsync($rfn, $opts); + yield $key => $client->sendAsync($rfn, $opts); } elseif (is_callable($rfn)) { - yield $rfn($opts); + yield $key => $rfn($opts); } else { throw new \InvalidArgumentException('Each value yielded by ' . 'the iterator must be a Psr7\Http\Message\RequestInterface ' diff --git a/vendor/guzzlehttp/guzzle/src/functions.php b/vendor/guzzlehttp/guzzle/src/functions.php index d0a2ca8..5e93b22 100644 --- a/vendor/guzzlehttp/guzzle/src/functions.php +++ b/vendor/guzzlehttp/guzzle/src/functions.php @@ -104,8 +104,12 @@ function debug_resource($value = null) function choose_handler() { $handler = null; - if (extension_loaded('curl')) { + if (function_exists('curl_multi_exec') && function_exists('curl_exec')) { $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler()); + } elseif (function_exists('curl_exec')) { + $handler = new CurlHandler(); + } elseif (function_exists('curl_multi_exec')) { + $handler = new CurlMultiHandler(); } if (ini_get('allow_url_fopen')) { diff --git a/vendor/guzzlehttp/promises/CHANGELOG.md b/vendor/guzzlehttp/promises/CHANGELOG.md index daad986..4031cb8 100644 --- a/vendor/guzzlehttp/promises/CHANGELOG.md +++ b/vendor/guzzlehttp/promises/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 1.0.3 - 2015-10-15 + +* Update EachPromise to immediately resolve when the underlying promise iterator + is empty. Previously, such a promise would throw an exception when its `wait` + function was called. + ## 1.0.2 - 2015-05-15 * Conditionally require functions.php. diff --git a/vendor/guzzlehttp/promises/src/EachPromise.php b/vendor/guzzlehttp/promises/src/EachPromise.php index 855d833..5918429 100644 --- a/vendor/guzzlehttp/promises/src/EachPromise.php +++ b/vendor/guzzlehttp/promises/src/EachPromise.php @@ -83,6 +83,11 @@ private function createPromise() { $this->aggregate = new Promise(function () { reset($this->pending); + if (empty($this->pending) && !$this->iterable->valid()) { + $this->aggregate->resolve(null); + return; + } + // Consume a potentially fluctuating list of promises while // ensuring that indexes are maintained (precluding array_shift). while ($promise = current($this->pending)) { diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md index 642dc9a..6cdfb39 100644 --- a/vendor/guzzlehttp/psr7/CHANGELOG.md +++ b/vendor/guzzlehttp/psr7/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 1.2.1 - 2015-11-02 + +* Now supporting negative offsets when seeking to SEEK_END. + ## 1.2.0 - 2015-08-15 * Body as `"0"` is now properly added to a response. diff --git a/vendor/guzzlehttp/psr7/src/CachingStream.php b/vendor/guzzlehttp/psr7/src/CachingStream.php index 796d581..420d5b0 100644 --- a/vendor/guzzlehttp/psr7/src/CachingStream.php +++ b/vendor/guzzlehttp/psr7/src/CachingStream.php @@ -52,8 +52,7 @@ public function seek($offset, $whence = SEEK_SET) if ($size === null) { $size = $this->cacheEntireStream(); } - // Because 0 is the first byte, we seek to size - 1. - $byte = $size - 1 - $offset; + $byte = $size + $offset; } else { throw new \InvalidArgumentException('Invalid whence'); } diff --git a/vendor/guzzlehttp/psr7/src/Request.php b/vendor/guzzlehttp/psr7/src/Request.php index 0189b14..ed1d3f5 100644 --- a/vendor/guzzlehttp/psr7/src/Request.php +++ b/vendor/guzzlehttp/psr7/src/Request.php @@ -26,8 +26,8 @@ class Request implements RequestInterface /** * @param null|string $method HTTP method for the request. - * @param null|string $uri URI for the request. - * @param array $headers Headers for the message. + * @param null|string|UriInterface $uri URI for the request. + * @param array $headers Headers for the message. * @param string|resource|StreamInterface $body Message body. * @param string $protocolVersion HTTP protocol version. * diff --git a/vendor/ircmaxell/password-compat/LICENSE.md b/vendor/ircmaxell/password-compat/LICENSE.md new file mode 100644 index 0000000..1efc565 --- /dev/null +++ b/vendor/ircmaxell/password-compat/LICENSE.md @@ -0,0 +1,7 @@ +Copyright (c) 2012 Anthony Ferrara + +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. \ No newline at end of file diff --git a/vendor/ircmaxell/password-compat/composer.json b/vendor/ircmaxell/password-compat/composer.json new file mode 100644 index 0000000..822fd1f --- /dev/null +++ b/vendor/ircmaxell/password-compat/composer.json @@ -0,0 +1,20 @@ +{ + "name": "ircmaxell/password-compat", + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "keywords": ["password", "hashing"], + "homepage": "https://github.com/ircmaxell/password_compat", + "license": "MIT", + "authors": [ + { + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" + } + ], + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "autoload": { + "files": ["lib/password.php"] + } +} diff --git a/vendor/ircmaxell/password-compat/lib/password.php b/vendor/ircmaxell/password-compat/lib/password.php new file mode 100644 index 0000000..cc6896c --- /dev/null +++ b/vendor/ircmaxell/password-compat/lib/password.php @@ -0,0 +1,314 @@ + + * @license http://www.opensource.org/licenses/mit-license.html MIT License + * @copyright 2012 The Authors + */ + +namespace { + + if (!defined('PASSWORD_BCRYPT')) { + /** + * PHPUnit Process isolation caches constants, but not function declarations. + * So we need to check if the constants are defined separately from + * the functions to enable supporting process isolation in userland + * code. + */ + define('PASSWORD_BCRYPT', 1); + define('PASSWORD_DEFAULT', PASSWORD_BCRYPT); + define('PASSWORD_BCRYPT_DEFAULT_COST', 10); + } + + if (!function_exists('password_hash')) { + + /** + * Hash the password using the specified algorithm + * + * @param string $password The password to hash + * @param int $algo The algorithm to use (Defined by PASSWORD_* constants) + * @param array $options The options for the algorithm to use + * + * @return string|false The hashed password, or false on error. + */ + function password_hash($password, $algo, array $options = array()) { + if (!function_exists('crypt')) { + trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING); + return null; + } + if (is_null($password) || is_int($password)) { + $password = (string) $password; + } + if (!is_string($password)) { + trigger_error("password_hash(): Password must be a string", E_USER_WARNING); + return null; + } + if (!is_int($algo)) { + trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING); + return null; + } + $resultLength = 0; + switch ($algo) { + case PASSWORD_BCRYPT: + $cost = PASSWORD_BCRYPT_DEFAULT_COST; + if (isset($options['cost'])) { + $cost = $options['cost']; + if ($cost < 4 || $cost > 31) { + trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING); + return null; + } + } + // The length of salt to generate + $raw_salt_len = 16; + // The length required in the final serialization + $required_salt_len = 22; + $hash_format = sprintf("$2y$%02d$", $cost); + // The expected length of the final crypt() output + $resultLength = 60; + break; + default: + trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING); + return null; + } + $salt_requires_encoding = false; + if (isset($options['salt'])) { + switch (gettype($options['salt'])) { + case 'NULL': + case 'boolean': + case 'integer': + case 'double': + case 'string': + $salt = (string) $options['salt']; + break; + case 'object': + if (method_exists($options['salt'], '__tostring')) { + $salt = (string) $options['salt']; + break; + } + case 'array': + case 'resource': + default: + trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING); + return null; + } + if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) { + trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING); + return null; + } elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt)) { + $salt_requires_encoding = true; + } + } else { + $buffer = ''; + $buffer_valid = false; + if (function_exists('mcrypt_create_iv') && !defined('PHALANGER')) { + $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM); + if ($buffer) { + $buffer_valid = true; + } + } + if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) { + $buffer = openssl_random_pseudo_bytes($raw_salt_len); + if ($buffer) { + $buffer_valid = true; + } + } + if (!$buffer_valid && @is_readable('/dev/urandom')) { + $f = fopen('/dev/urandom', 'r'); + $read = PasswordCompat\binary\_strlen($buffer); + while ($read < $raw_salt_len) { + $buffer .= fread($f, $raw_salt_len - $read); + $read = PasswordCompat\binary\_strlen($buffer); + } + fclose($f); + if ($read >= $raw_salt_len) { + $buffer_valid = true; + } + } + if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) { + $bl = PasswordCompat\binary\_strlen($buffer); + for ($i = 0; $i < $raw_salt_len; $i++) { + if ($i < $bl) { + $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255)); + } else { + $buffer .= chr(mt_rand(0, 255)); + } + } + } + $salt = $buffer; + $salt_requires_encoding = true; + } + if ($salt_requires_encoding) { + // encode string with the Base64 variant used by crypt + $base64_digits = + 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; + $bcrypt64_digits = + './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + + $base64_string = base64_encode($salt); + $salt = strtr(rtrim($base64_string, '='), $base64_digits, $bcrypt64_digits); + } + $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len); + + $hash = $hash_format . $salt; + + $ret = crypt($password, $hash); + + if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength) { + return false; + } + + return $ret; + } + + /** + * Get information about the password hash. Returns an array of the information + * that was used to generate the password hash. + * + * array( + * 'algo' => 1, + * 'algoName' => 'bcrypt', + * 'options' => array( + * 'cost' => PASSWORD_BCRYPT_DEFAULT_COST, + * ), + * ) + * + * @param string $hash The password hash to extract info from + * + * @return array The array of information about the hash. + */ + function password_get_info($hash) { + $return = array( + 'algo' => 0, + 'algoName' => 'unknown', + 'options' => array(), + ); + if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60) { + $return['algo'] = PASSWORD_BCRYPT; + $return['algoName'] = 'bcrypt'; + list($cost) = sscanf($hash, "$2y$%d$"); + $return['options']['cost'] = $cost; + } + return $return; + } + + /** + * Determine if the password hash needs to be rehashed according to the options provided + * + * If the answer is true, after validating the password using password_verify, rehash it. + * + * @param string $hash The hash to test + * @param int $algo The algorithm used for new password hashes + * @param array $options The options array passed to password_hash + * + * @return boolean True if the password needs to be rehashed. + */ + function password_needs_rehash($hash, $algo, array $options = array()) { + $info = password_get_info($hash); + if ($info['algo'] != $algo) { + return true; + } + switch ($algo) { + case PASSWORD_BCRYPT: + $cost = isset($options['cost']) ? $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST; + if ($cost != $info['options']['cost']) { + return true; + } + break; + } + return false; + } + + /** + * Verify a password against a hash using a timing attack resistant approach + * + * @param string $password The password to verify + * @param string $hash The hash to verify against + * + * @return boolean If the password matches the hash + */ + function password_verify($password, $hash) { + if (!function_exists('crypt')) { + trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING); + return false; + } + $ret = crypt($password, $hash); + if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) { + return false; + } + + $status = 0; + for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) { + $status |= (ord($ret[$i]) ^ ord($hash[$i])); + } + + return $status === 0; + } + } + +} + +namespace PasswordCompat\binary { + + if (!function_exists('PasswordCompat\\binary\\_strlen')) { + + /** + * Count the number of bytes in a string + * + * We cannot simply use strlen() for this, because it might be overwritten by the mbstring extension. + * In this case, strlen() will count the number of *characters* based on the internal encoding. A + * sequence of bytes might be regarded as a single multibyte character. + * + * @param string $binary_string The input string + * + * @internal + * @return int The number of bytes + */ + function _strlen($binary_string) { + if (function_exists('mb_strlen')) { + return mb_strlen($binary_string, '8bit'); + } + return strlen($binary_string); + } + + /** + * Get a substring based on byte limits + * + * @see _strlen() + * + * @param string $binary_string The input string + * @param int $start + * @param int $length + * + * @internal + * @return string The substring + */ + function _substr($binary_string, $start, $length) { + if (function_exists('mb_substr')) { + return mb_substr($binary_string, $start, $length, '8bit'); + } + return substr($binary_string, $start, $length); + } + + /** + * Check if current PHP version is compatible with the library + * + * @return boolean the check result + */ + function check() { + static $pass = NULL; + + if (is_null($pass)) { + if (function_exists('crypt')) { + $hash = '$2y$04$usesomesillystringfore7hnbRJHxXVLeakoG8K30oukPsA.ztMG'; + $test = crypt("password", $hash); + $pass = $test == $hash; + } else { + $pass = false; + } + } + return $pass; + } + + } +} \ No newline at end of file diff --git a/vendor/ircmaxell/password-compat/version-test.php b/vendor/ircmaxell/password-compat/version-test.php new file mode 100644 index 0000000..96f60ca --- /dev/null +++ b/vendor/ircmaxell/password-compat/version-test.php @@ -0,0 +1,6 @@ +level(\Symfony\CS\FixerInterface::NONE_LEVEL) ->fixers( array( + 'align_double_arrow', + 'align_equals', + 'braces', + 'concat_with_spaces', 'duplicate_semicolon', + 'elseif', 'empty_return', + 'encoding', + 'eof_ending', 'extra_empty_lines', + 'function_call_space', + 'function_declaration', + 'indentation', 'join_function', + 'line_after_namespace', + 'linefeed', 'list_commas', + 'long_array_syntax', + 'lowercase_constants', + 'lowercase_keywords', + 'method_argument_space', + 'multiple_use', + 'namespace_no_leading_whitespace', 'no_blank_lines_after_class_opening', 'no_empty_lines_after_phpdocs', + 'parenthesis', + 'php_closing_tag', 'phpdoc_indent', 'phpdoc_no_access', 'phpdoc_no_empty_return', 'phpdoc_no_package', 'phpdoc_params', 'phpdoc_scalar', + 'phpdoc_separation', 'phpdoc_to_comment', 'phpdoc_trim', + 'phpdoc_types', + 'phpdoc_var_without_name', + 'remove_lines_between_uses', 'return', 'self_accessor', + 'short_tag', + 'single_line_after_imports', 'single_quote', 'spaces_before_semicolon', 'spaces_cast', 'ternary_spaces', + 'trailing_spaces', 'trim_array_spaces', 'unused_use', - 'whitespacy_lines', - 'align_double_arrow', - 'align_equals', - 'concat_with_spaces' + 'visibility', + 'whitespacy_lines' ) ) ->finder($finder); diff --git a/vendor/phpunit/phpunit/ChangeLog-4.8.md b/vendor/phpunit/phpunit/ChangeLog-4.8.md index 9fc5845..177b25b 100644 --- a/vendor/phpunit/phpunit/ChangeLog-4.8.md +++ b/vendor/phpunit/phpunit/ChangeLog-4.8.md @@ -2,6 +2,58 @@ All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [4.8.18] - 2015-11-11 + +### Changed + +* DbUnit 1.4 is bundled again in the PHAR distribution + +## [4.8.17] - 2015-11-10 + +### Fixed + +* Fixed [#1935](https://github.com/sebastianbergmann/phpunit/issues/1935): `PHP_CodeCoverage_Exception` not handled properly +* Fixed [#1948](https://github.com/sebastianbergmann/phpunit/issues/1948): Unable to use PHAR due to unsupported signature error + +### Changed + +* DbUnit >= 2.0.2 is now bundled in the PHAR distribution + +## [4.8.16] - 2015-10-23 + +### Added + +* Implemented [#1925](https://github.com/sebastianbergmann/phpunit/issues/1925): Provide a library-only PHAR + +## [4.8.15] - 2015-10-22 + +### Fixed + +* The backup of global state is now properly restored when changes to global state are disallowed +* The `__PHPUNIT_PHAR__` constant is now properly set when the PHPUnit PHAR is used as a library + +## [4.8.14] - 2015-10-17 + +### Fixed + +* Fixed [#1892](https://github.com/sebastianbergmann/phpunit/issues/1892): `--coverage-text` does not honor color settings + +## [4.8.13] - 2015-10-14 + +### Added + +* Added the `--self-upgrade` commandline switch for upgrading a PHPUnit PHAR to the latest version + +### Changed + +* The `--self-update` commandline switch now updates a PHPUnit PHAR to the latest version within the same release series + +## [4.8.12] - 2015-10-12 + +### Changed + +* Merged [#1893](https://github.com/sebastianbergmann/phpunit/issues/1893): Removed workaround for phpab bug + ## [4.8.11] - 2015-10-07 ### Fixed @@ -85,6 +137,12 @@ New PHAR release due to updated dependencies * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808) * Changed the name of the default group from `__nogroup__` to `default` +[4.8.17]: https://github.com/sebastianbergmann/phpunit/compare/4.8.16...4.8.17 +[4.8.16]: https://github.com/sebastianbergmann/phpunit/compare/4.8.15...4.8.16 +[4.8.15]: https://github.com/sebastianbergmann/phpunit/compare/4.8.14...4.8.15 +[4.8.14]: https://github.com/sebastianbergmann/phpunit/compare/4.8.13...4.8.14 +[4.8.13]: https://github.com/sebastianbergmann/phpunit/compare/4.8.12...4.8.13 +[4.8.12]: https://github.com/sebastianbergmann/phpunit/compare/4.8.11...4.8.12 [4.8.11]: https://github.com/sebastianbergmann/phpunit/compare/4.8.10...4.8.11 [4.8.10]: https://github.com/sebastianbergmann/phpunit/compare/4.8.9...4.8.10 [4.8.9]: https://github.com/sebastianbergmann/phpunit/compare/4.8.8...4.8.9 diff --git a/vendor/phpunit/phpunit/build.xml b/vendor/phpunit/phpunit/build.xml index ef816e6..3020a13 100644 --- a/vendor/phpunit/phpunit/build.xml +++ b/vendor/phpunit/phpunit/build.xml @@ -45,6 +45,12 @@ + + + + + + @@ -248,14 +254,30 @@ - + + + + + + + + + + + + + + + + + - + diff --git a/vendor/phpunit/phpunit/build/bin/phpab b/vendor/phpunit/phpunit/build/bin/phpab new file mode 100755 index 0000000..9a342f2 --- /dev/null +++ b/vendor/phpunit/phpunit/build/bin/phpab @@ -0,0 +1,891 @@ +#!/usr/bin/env php + '/vendor/zetacomponents/base/src/base.php', + 'ezcbaseconfigurationinitializer' => '/vendor/zetacomponents/base/src/interfaces/configuration_initializer.php', + 'ezcbasedoubleclassrepositoryprefixexception' => '/vendor/zetacomponents/base/src/exceptions/double_class_repository_prefix.php', + 'ezcbaseexception' => '/vendor/zetacomponents/base/src/exceptions/exception.php', + 'ezcbaseexportable' => '/vendor/zetacomponents/base/src/interfaces/exportable.php', + 'ezcbaseextensionnotfoundexception' => '/vendor/zetacomponents/base/src/exceptions/extension_not_found.php', + 'ezcbasefeatures' => '/vendor/zetacomponents/base/src/features.php', + 'ezcbasefile' => '/vendor/zetacomponents/base/src/file.php', + 'ezcbasefileexception' => '/vendor/zetacomponents/base/src/exceptions/file_exception.php', + 'ezcbasefilefindcontext' => '/vendor/zetacomponents/base/src/structs/file_find_context.php', + 'ezcbasefileioexception' => '/vendor/zetacomponents/base/src/exceptions/file_io.php', + 'ezcbasefilenotfoundexception' => '/vendor/zetacomponents/base/src/exceptions/file_not_found.php', + 'ezcbasefilepermissionexception' => '/vendor/zetacomponents/base/src/exceptions/file_permission.php', + 'ezcbasefunctionalitynotsupportedexception' => '/vendor/zetacomponents/base/src/exceptions/functionality_not_supported.php', + 'ezcbaseinit' => '/vendor/zetacomponents/base/src/init.php', + 'ezcbaseinitcallbackconfiguredexception' => '/vendor/zetacomponents/base/src/exceptions/init_callback_configured.php', + 'ezcbaseinitinvalidcallbackclassexception' => '/vendor/zetacomponents/base/src/exceptions/invalid_callback_class.php', + 'ezcbaseinvalidparentclassexception' => '/vendor/zetacomponents/base/src/exceptions/invalid_parent_class.php', + 'ezcbasemetadata' => '/vendor/zetacomponents/base/src/metadata.php', + 'ezcbasemetadatapearreader' => '/vendor/zetacomponents/base/src/metadata/pear.php', + 'ezcbasemetadatatarballreader' => '/vendor/zetacomponents/base/src/metadata/tarball.php', + 'ezcbaseoptions' => '/vendor/zetacomponents/base/src/options.php', + 'ezcbasepersistable' => '/vendor/zetacomponents/base/src/interfaces/persistable.php', + 'ezcbasepropertynotfoundexception' => '/vendor/zetacomponents/base/src/exceptions/property_not_found.php', + 'ezcbasepropertypermissionexception' => '/vendor/zetacomponents/base/src/exceptions/property_permission.php', + 'ezcbaserepositorydirectory' => '/vendor/zetacomponents/base/src/structs/repository_directory.php', + 'ezcbasesettingnotfoundexception' => '/vendor/zetacomponents/base/src/exceptions/setting_not_found.php', + 'ezcbasesettingvalueexception' => '/vendor/zetacomponents/base/src/exceptions/setting_value.php', + 'ezcbasestruct' => '/vendor/zetacomponents/base/src/struct.php', + 'ezcbasevalueexception' => '/vendor/zetacomponents/base/src/exceptions/value.php', + 'ezcbasewhateverexception' => '/vendor/zetacomponents/base/src/exceptions/whatever.php', + 'ezcconsoleargument' => '/vendor/zetacomponents/console-tools/src/input/argument.php', + 'ezcconsoleargumentalreadyregisteredexception' => '/vendor/zetacomponents/console-tools/src/exceptions/argument_already_registered.php', + 'ezcconsoleargumentexception' => '/vendor/zetacomponents/console-tools/src/exceptions/argument.php', + 'ezcconsoleargumentmandatoryviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/argument_mandatory_violation.php', + 'ezcconsolearguments' => '/vendor/zetacomponents/console-tools/src/input/arguments.php', + 'ezcconsoleargumenttypeviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/argument_type_violation.php', + 'ezcconsoledialog' => '/vendor/zetacomponents/console-tools/src/interfaces/dialog.php', + 'ezcconsoledialogabortexception' => '/vendor/zetacomponents/console-tools/src/exceptions/dialog_abort.php', + 'ezcconsoledialogoptions' => '/vendor/zetacomponents/console-tools/src/options/dialog.php', + 'ezcconsoledialogvalidator' => '/vendor/zetacomponents/console-tools/src/interfaces/dialog_validator.php', + 'ezcconsoledialogviewer' => '/vendor/zetacomponents/console-tools/src/dialog_viewer.php', + 'ezcconsoleexception' => '/vendor/zetacomponents/console-tools/src/exceptions/exception.php', + 'ezcconsoleinput' => '/vendor/zetacomponents/console-tools/src/input.php', + 'ezcconsoleinputhelpgenerator' => '/vendor/zetacomponents/console-tools/src/interfaces/input_help_generator.php', + 'ezcconsoleinputstandardhelpgenerator' => '/vendor/zetacomponents/console-tools/src/input/help_generators/standard.php', + 'ezcconsoleinputvalidator' => '/vendor/zetacomponents/console-tools/src/interfaces/input_validator.php', + 'ezcconsoleinvalidoptionnameexception' => '/vendor/zetacomponents/console-tools/src/exceptions/invalid_option_name.php', + 'ezcconsoleinvalidoutputtargetexception' => '/vendor/zetacomponents/console-tools/src/exceptions/invalid_output_target.php', + 'ezcconsolemenudialog' => '/vendor/zetacomponents/console-tools/src/dialog/menu_dialog.php', + 'ezcconsolemenudialogdefaultvalidator' => '/vendor/zetacomponents/console-tools/src/dialog/validators/menu_dialog_default.php', + 'ezcconsolemenudialogoptions' => '/vendor/zetacomponents/console-tools/src/options/menu_dialog.php', + 'ezcconsolemenudialogvalidator' => '/vendor/zetacomponents/console-tools/src/interfaces/menu_dialog_validator.php', + 'ezcconsolenopositionstoredexception' => '/vendor/zetacomponents/console-tools/src/exceptions/no_position_stored.php', + 'ezcconsolenovaliddialogresultexception' => '/vendor/zetacomponents/console-tools/src/exceptions/no_valid_dialog_result.php', + 'ezcconsoleoption' => '/vendor/zetacomponents/console-tools/src/input/option.php', + 'ezcconsoleoptionalreadyregisteredexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_already_registered.php', + 'ezcconsoleoptionargumentsviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_arguments_violation.php', + 'ezcconsoleoptiondependencyviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_dependency_violation.php', + 'ezcconsoleoptionexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option.php', + 'ezcconsoleoptionexclusionviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_exclusion_violation.php', + 'ezcconsoleoptionmandatoryviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_mandatory_violation.php', + 'ezcconsoleoptionmissingvalueexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_missing_value.php', + 'ezcconsoleoptionnoaliasexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_no_alias.php', + 'ezcconsoleoptionnotexistsexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_not_exists.php', + 'ezcconsoleoptionrule' => '/vendor/zetacomponents/console-tools/src/structs/option_rule.php', + 'ezcconsoleoptionstringnotwellformedexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_string_not_wellformed.php', + 'ezcconsoleoptiontoomanyvaluesexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_too_many_values.php', + 'ezcconsoleoptiontypeviolationexception' => '/vendor/zetacomponents/console-tools/src/exceptions/option_type_violation.php', + 'ezcconsoleoutput' => '/vendor/zetacomponents/console-tools/src/output.php', + 'ezcconsoleoutputformat' => '/vendor/zetacomponents/console-tools/src/structs/output_format.php', + 'ezcconsoleoutputformats' => '/vendor/zetacomponents/console-tools/src/structs/output_formats.php', + 'ezcconsoleoutputoptions' => '/vendor/zetacomponents/console-tools/src/options/output.php', + 'ezcconsoleprogressbar' => '/vendor/zetacomponents/console-tools/src/progressbar.php', + 'ezcconsoleprogressbaroptions' => '/vendor/zetacomponents/console-tools/src/options/progressbar.php', + 'ezcconsoleprogressmonitor' => '/vendor/zetacomponents/console-tools/src/progressmonitor.php', + 'ezcconsoleprogressmonitoroptions' => '/vendor/zetacomponents/console-tools/src/options/progressmonitor.php', + 'ezcconsolequestiondialog' => '/vendor/zetacomponents/console-tools/src/dialog/question_dialog.php', + 'ezcconsolequestiondialogcollectionvalidator' => '/vendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_collection.php', + 'ezcconsolequestiondialogmappingvalidator' => '/vendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_mapping.php', + 'ezcconsolequestiondialogoptions' => '/vendor/zetacomponents/console-tools/src/options/question_dialog.php', + 'ezcconsolequestiondialogregexvalidator' => '/vendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_regex.php', + 'ezcconsolequestiondialogtypevalidator' => '/vendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_type.php', + 'ezcconsolequestiondialogvalidator' => '/vendor/zetacomponents/console-tools/src/interfaces/question_dialog_validator.php', + 'ezcconsolestandardinputvalidator' => '/vendor/zetacomponents/console-tools/src/input/validators/standard.php', + 'ezcconsolestatusbar' => '/vendor/zetacomponents/console-tools/src/statusbar.php', + 'ezcconsolestatusbaroptions' => '/vendor/zetacomponents/console-tools/src/options/statusbar.php', + 'ezcconsolestringtool' => '/vendor/zetacomponents/console-tools/src/tools/string.php', + 'ezcconsoletable' => '/vendor/zetacomponents/console-tools/src/table.php', + 'ezcconsoletablecell' => '/vendor/zetacomponents/console-tools/src/table/cell.php', + 'ezcconsoletableoptions' => '/vendor/zetacomponents/console-tools/src/options/table.php', + 'ezcconsoletablerow' => '/vendor/zetacomponents/console-tools/src/table/row.php', + 'ezcconsoletoomanyargumentsexception' => '/vendor/zetacomponents/console-tools/src/exceptions/argument_too_many.php', + 'theseer\\autoload\\application' => '/phpab/Application.php', + 'theseer\\autoload\\applicationexception' => '/phpab/Application.php', + 'theseer\\autoload\\autoloadbuilderexception' => '/phpab/AutoloadRenderer.php', + 'theseer\\autoload\\autoloadrenderer' => '/phpab/AutoloadRenderer.php', + 'theseer\\autoload\\cache' => '/phpab/Cache.php', + 'theseer\\autoload\\cacheentry' => '/phpab/CacheEntry.php', + 'theseer\\autoload\\cacheexception' => '/phpab/Cache.php', + 'theseer\\autoload\\cachingparser' => '/phpab/CachingParser.php', + 'theseer\\autoload\\classdependencysorter' => '/phpab/DependencySorter.php', + 'theseer\\autoload\\classdependencysorterexception' => '/phpab/DependencySorter.php', + 'theseer\\autoload\\cli' => '/phpab/CLI.php', + 'theseer\\autoload\\clienvironmentexception' => '/phpab/CLI.php', + 'theseer\\autoload\\collector' => '/phpab/Collector.php', + 'theseer\\autoload\\collectorexception' => '/phpab/Collector.php', + 'theseer\\autoload\\collectorresult' => '/phpab/CollectorResult.php', + 'theseer\\autoload\\collectorresultexception' => '/phpab/CollectorResult.php', + 'theseer\\autoload\\composeriterator' => '/phpab/ComposerIterator.php', + 'theseer\\autoload\\composeriteratorexception' => '/phpab/ComposerIterator.php', + 'theseer\\autoload\\config' => '/phpab/Config.php', + 'theseer\\autoload\\factory' => '/phpab/Factory.php', + 'theseer\\autoload\\logger' => '/phpab/Logger.php', + 'theseer\\autoload\\parser' => '/phpab/Parser.php', + 'theseer\\autoload\\parseresult' => '/phpab/ParseResult.php', + 'theseer\\autoload\\parserexception' => '/phpab/Parser.php', + 'theseer\\autoload\\parserinterface' => '/phpab/ParserInterface.php', + 'theseer\\autoload\\pathcomparator' => '/phpab/PathComparator.php', + 'theseer\\autoload\\pharbuilder' => '/phpab/PharBuilder.php', + 'theseer\\autoload\\sourcefile' => '/phpab/SourceFile.php', + 'theseer\\autoload\\staticrenderer' => '/phpab/StaticRenderer.php', + 'theseer\\autoload\\version' => '/phpab/Version.php', + 'theseer\\directoryscanner\\directoryscanner' => '/vendor/theseer/directoryscanner/src/directoryscanner.php', + 'theseer\\directoryscanner\\exception' => '/vendor/theseer/directoryscanner/src/directoryscanner.php', + 'theseer\\directoryscanner\\filesonlyfilteriterator' => '/vendor/theseer/directoryscanner/src/filesonlyfilter.php', + 'theseer\\directoryscanner\\includeexcludefilteriterator' => '/vendor/theseer/directoryscanner/src/includeexcludefilter.php', + 'theseer\\directoryscanner\\phpfilteriterator' => '/vendor/theseer/directoryscanner/src/phpfilter.php' + ); + } + + $class = strtolower($class); + + if (isset($classes[$class])) { + require 'phar://phpab.phar' . $classes[$class]; + } + } +); + +Phar::mapPhar('phpab.phar'); +define('PHPAB_VERSION', '1.21.0'); +$factory = new \TheSeer\Autoload\Factory(); +$factory->getCLI()->run(); +exit(0); + +__HALT_COMPILER(); ?> +) +phpab.phar8vendor/theseer/directoryscanner/src/directoryscanner.php"\BVA P7vendor/theseer/directoryscanner/src/filesonlyfilter.php +\BVAf<vendor/theseer/directoryscanner/src/includeexcludefilter.php^\BVTBl1vendor/theseer/directoryscanner/src/phpfilter.php \BVFA'vendor/zetacomponents/base/src/base.phpY\BV\0vendor/zetacomponents/base/src/base_autoload.phpN\BVH¬Lvendor/zetacomponents/base/src/exceptions/double_class_repository_prefix.phpV\BV6w7vendor/zetacomponents/base/src/exceptions/exception.php\BV CTsAvendor/zetacomponents/base/src/exceptions/extension_not_found.php6\BV~9 <vendor/zetacomponents/base/src/exceptions/file_exception.php-\BV5vendor/zetacomponents/base/src/exceptions/file_io.php\BVO;<vendor/zetacomponents/base/src/exceptions/file_not_found.phpJ\BV,T]DX=vendor/zetacomponents/base/src/exceptions/file_permission.php \BVDg7Ivendor/zetacomponents/base/src/exceptions/functionality_not_supported.php>\BV V&JFvendor/zetacomponents/base/src/exceptions/init_callback_configured.php\BV: Dvendor/zetacomponents/base/src/exceptions/invalid_callback_class.php_\BV +Z»Bvendor/zetacomponents/base/src/exceptions/invalid_parent_class.phpE\BV@vendor/zetacomponents/base/src/exceptions/property_not_found.php\BV"yAAvendor/zetacomponents/base/src/exceptions/property_permission.phpf\BVW>D?vendor/zetacomponents/base/src/exceptions/setting_not_found.phpT\BVH[Y;vendor/zetacomponents/base/src/exceptions/setting_value.php[\BV3vendor/zetacomponents/base/src/exceptions/value.php\BV.Ѷ6vendor/zetacomponents/base/src/exceptions/whatever.php \BV8K0vendor/zetacomponents/base/src/ezc_bootstrap.php|\BVMɶ+vendor/zetacomponents/base/src/features.php.\BV +''vendor/zetacomponents/base/src/file.php_H\BV ^'vendor/zetacomponents/base/src/init.phpV\BVukoGvendor/zetacomponents/base/src/interfaces/configuration_initializer.php\BVE8vendor/zetacomponents/base/src/interfaces/exportable.php\BVB59vendor/zetacomponents/base/src/interfaces/persistable.php\BV9J +vendor/zetacomponents/base/src/metadata.php\BVb0vendor/zetacomponents/base/src/metadata/pear.php\BV<3vendor/zetacomponents/base/src/metadata/tarball.php\BV g^*vendor/zetacomponents/base/src/options.php\BVy*Ll)vendor/zetacomponents/base/src/struct.php?\BVt<vendor/zetacomponents/base/src/structs/file_find_context.php \BV-њ?vendor/zetacomponents/base/src/structs/repository_directory.php \BVL8'U<vendor/zetacomponents/console-tools/src/console_autoload.phpr\BVi>vendor/zetacomponents/console-tools/src/dialog/menu_dialog.php\BV1wԶBvendor/zetacomponents/console-tools/src/dialog/question_dialog.php"\BV tQvendor/zetacomponents/console-tools/src/dialog/validators/menu_dialog_default.php\BV+Xvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_collection.php\BVONUvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_mapping.php\BVFSvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_regex.php\BV{Rvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_type.phpC\BV(9vendor/zetacomponents/console-tools/src/dialog_viewer.php" +\BV?R28?vendor/zetacomponents/console-tools/src/exceptions/argument.php\BVX ζRvendor/zetacomponents/console-tools/src/exceptions/argument_already_registered.phpE \BV/wm'Svendor/zetacomponents/console-tools/src/exceptions/argument_mandatory_violation.php\BV Hvendor/zetacomponents/console-tools/src/exceptions/argument_too_many.php\BV*Y۶Nvendor/zetacomponents/console-tools/src/exceptions/argument_type_violation.phps\BVu[:MCvendor/zetacomponents/console-tools/src/exceptions/dialog_abort.php\BV"@vendor/zetacomponents/console-tools/src/exceptions/exception.php\BVP[ Jvendor/zetacomponents/console-tools/src/exceptions/invalid_option_name.php\BVdLvendor/zetacomponents/console-tools/src/exceptions/invalid_output_target.php\BV]vmwIvendor/zetacomponents/console-tools/src/exceptions/no_position_stored.php\BVRGyMvendor/zetacomponents/console-tools/src/exceptions/no_valid_dialog_result.php\BVX=vendor/zetacomponents/console-tools/src/exceptions/option.php\BV}YPvendor/zetacomponents/console-tools/src/exceptions/option_already_registered.php\BV-/߶Qvendor/zetacomponents/console-tools/src/exceptions/option_arguments_violation.php\BV~xRvendor/zetacomponents/console-tools/src/exceptions/option_dependency_violation.php\BVrQvendor/zetacomponents/console-tools/src/exceptions/option_exclusion_violation.php\BVhVmQvendor/zetacomponents/console-tools/src/exceptions/option_mandatory_violation.phph\BVYXpAKvendor/zetacomponents/console-tools/src/exceptions/option_missing_value.php\BVF^Fvendor/zetacomponents/console-tools/src/exceptions/option_no_alias.php \BVHvendor/zetacomponents/console-tools/src/exceptions/option_not_exists.php$\BV6ESvendor/zetacomponents/console-tools/src/exceptions/option_string_not_wellformed.php \BV0Mvendor/zetacomponents/console-tools/src/exceptions/option_too_many_values.phpw\BVLvendor/zetacomponents/console-tools/src/exceptions/option_type_violation.php\BVD/1vendor/zetacomponents/console-tools/src/input.phpK\BV&}h:vendor/zetacomponents/console-tools/src/input/argument.php\BVh";vendor/zetacomponents/console-tools/src/input/arguments.phpb!\BVJESJvendor/zetacomponents/console-tools/src/input/help_generators/standard.php9\BVBj8vendor/zetacomponents/console-tools/src/input/option.phpO\BVS~Evendor/zetacomponents/console-tools/src/input/validators/standard.php\BV x=vendor/zetacomponents/console-tools/src/interfaces/dialog.phpT \BV*/Z;Gvendor/zetacomponents/console-tools/src/interfaces/dialog_validator.php\BV 5Kvendor/zetacomponents/console-tools/src/interfaces/input_help_generator.php\BVtӁFvendor/zetacomponents/console-tools/src/interfaces/input_validator.phpy\BVeutovLvendor/zetacomponents/console-tools/src/interfaces/menu_dialog_validator.php\BVTPvendor/zetacomponents/console-tools/src/interfaces/question_dialog_validator.php\BV&cֶ:vendor/zetacomponents/console-tools/src/options/dialog.php2 \BV3Y?vendor/zetacomponents/console-tools/src/options/menu_dialog.php\BV1vf:vendor/zetacomponents/console-tools/src/options/output.php\BV0ِI?vendor/zetacomponents/console-tools/src/options/progressbar.php\BVte%Cvendor/zetacomponents/console-tools/src/options/progressmonitor.phpF \BV Cvendor/zetacomponents/console-tools/src/options/question_dialog.php\BVWia=vendor/zetacomponents/console-tools/src/options/statusbar.php \BVp~[9vendor/zetacomponents/console-tools/src/options/table.phpL"\BVseK2vendor/zetacomponents/console-tools/src/output.phpM\BVW?7vendor/zetacomponents/console-tools/src/progressbar.php:\BVdm|;vendor/zetacomponents/console-tools/src/progressmonitor.phpZ\BVq5vendor/zetacomponents/console-tools/src/statusbar.php \BVj rM?vendor/zetacomponents/console-tools/src/structs/option_rule.php\BV Avendor/zetacomponents/console-tools/src/structs/output_format.phpk\BVh+-Bvendor/zetacomponents/console-tools/src/structs/output_formats.php+\BVD1vendor/zetacomponents/console-tools/src/table.php)s\BVsB16vendor/zetacomponents/console-tools/src/table/cell.php\BV+(Կ5vendor/zetacomponents/console-tools/src/table/row.phpw/\BV +h%ڶ8vendor/zetacomponents/console-tools/src/tools/string.php\BVF)phpab/Application.php \BVa +K䛶phpab/AutoloadRenderer.phpb#\BV +B" phpab/CLI.phpY\BV'޶phpab/Cache.php@\BV "9phpab/CacheEntry.php\BVжphpab/CachingParser.php\BVPI!phpab/Collector.phpe \BV*gLqphpab/CollectorResult.php +\BV8[ phpab/ComposerIterator.phpy\BVRphpab/Config.php/0\BVk öphpab/DependencySorter.phpm\BVo0&_phpab/Factory.php;\BV+Զphpab/Logger.php\BV!phpab/ParseResult.phpg\BVWߪphpab/Parser.php C\BV +lPphpab/ParserInterface.php\BVphpab/PathComparator.phpf\BVhaphpab/PharBuilder.phpw\BVDLBphpab/SourceFile.php\BV%phpab/StaticRenderer.php\BV,phpab/Version.php +\BV?"phpab/templates/ci/default.php.tpl\BV/]iphpab/templates/ci/phar.php.tpl\BV~ phpab/templates/ci/php52.php.tpl\BV ^@N"phpab/templates/cs/default.php.tpl\BVBw#phpab/templates/cs/phar.php.tpl\BV2q$ phpab/templates/cs/php52.php.tpl\BV&N˶phpab/templates/static.php.tpl\BVp휺"phpab/templates/staticphar.php.tplW\BVT.ֶYsbk CL^_j?[!QI4F6ۻ{:&)nwo{{_~[<,Nޝ;ċURhLÇ??DB/zI*?3JZp'{4 4#"CɄ7 Ld.Z'La4x$E2Â' M$~ +|^8 9f0#? >!<=Wzni$z)Rēz,M喊4V& $@S\8KZ᪓ <9; ZK (~;7]U{kҊ=\Rfzghh6I 0 ]g3TvL0*#"\xPY`r۬ͨvD%8i0D!det8]]#F@%됓:CIqGepmY]iyٷz9`X4a-\Z4Rj8㫡Hn̶W&-jݕLe$!]тLd8;nWE{`kCffѬEt5ehٺC4z+ t ܒZV'3bh]ue|g|ZxGoi[uOpӮE<Z"]ijpU"bf邑=C.lۘINDf)}}-?NNHdJ  &x!%f8e+9,>H~5 L$kr}_i*M M(PW_bMm/~-jΆ{e1iFܱv@mD,Æ9,34hMs-{ ՁT5+*CP¶TB0eȅ[/ q~C?˝^&|AK4NX~ !͋-ߪoڭfy ^ _a)l1; @ԑWπOØ2(A{cȬY[y>?Yaݍ޽-%U,%`U~Tvͣ藡M~-³')`Bה ugpoVn(@'G5Jq[ 5a-yrD1G߯Uq=5Ks|8z#9^_̕ŜoϺf,痽*kXR6hB,B3]Tv̓gN(1bTЮ ~kK)[4m'էԠd}8snע8cd=ƠpL/ ~Pu@Q<PŽCqS kW|<1ɪ2jwɡz r 7CSHתVci9UPc7.AZ +T(CK)QbSϟ"},,#l_+YQfڑOGKٶꧥ#CE1?|_RQ⯺H6b]:` ;/HUVjz+ނs>Aeme<8q* %G'yvkʞxyU`e9اL:ݓSkaB+ +WIJ/O fe6M|Wq +woĮ;ɭĐ睌`}kVhgtDLUIRz mHsFͽ1>k =xN#V&gvS\ґ鈵Eeڎfw2jr:kui=g[ |ٹ__oůUK#_ͫ_&X yxʡf4Rt~_U|ƫK yi.ٚ3I֌ dEI{stg UxɷVao6_q(V.ܤ+eiE蘀,y4@蘈,,wGɋKlKwGeٍ߾[ݽכ> 2I?Qʒ$[<&(*L=qjFpI SX0\m(&Ht [vG|͆uIJRZ4++-*+ryJu))˩,jHrhUmimVPYm4[e,S(I;YUɔvRTkQោͦkJ<ʹ]iz{J*VH]jbYhQT^TY"A%+iO?pBd#TG?@=^:4676״H+CzǨKE[QIM/)%Oї:J b/.[BԍL +y +=,ۢ)@iAHY[tCkr'gt)^yhe$`_!#̥`~iLsYX㐏qgvgf@fW>CEgssY}[?> ALq`5LhBgO{=_:!ma̝g|΃N|#@\b̏)ڞ`Hv8fk=քC.oxHϢh_d[x? AN=ϑvtEfx0Ѯ8ykXxDE,mKA"?1 peySy,?g n=uJNkKj}H:ʍD +oE:6O\eIɍ50"?LKxR M|V@_{{T%d1c/HP⮷zwB,['OCi~J$fHk&J_N !JlTiv^ڬH_wPTC҇ӫoL}V}p4BOP\ӯwNW/O +{:/v;uT?ujCI=fJ1ZQ 2ZЖDJaP$;Bɲ(pb9ZGf~w{RҴH/jj`>O2y c]S%kYZ,*_MJJʌZR^R*dIHUjfK2_6SYDX3$e˛Ff}al$pB=rmWl>q_bImA*v[7ȧIM^LSiuhg̞Ei;YC4: ZD?D}J۝,CvI#<) 0g SenlNYI\wXGZK]HD,3IJS&eH:FjiP C{:mUvV׃L$Ytm^wK9&EDsY(]Qȧq-`<lUȄ $\yxp~ęܟ[ fǗC\,'mi9PXOc5 xk0HmX79 Ѹ s]/qiŚ8[!@ 5|Fdgsϙ0- 45lbJ+B ϱN\b떃r^q|lJ|p*bgѳx$IlB%9OZ<(O],@tY#h*\-D1YRB+<4)KtG#mj$6 4>ߤѽJQr&[z!@['Ia>-3Nu/+.DM:5_̈be5>;I\J`ZyfP@ym& zLmUUz͡%z[a*\ˁ]lhӖiO &/7Ωtk6goK{{U; ]&z2_ٌ'wY%Vx2mONΞпuDm5(Ȳ.o±39yBNN*Hx,II,Z'ׯT$I*I+hC,r.< +q-%9?)'aU˜0$"*LB\:DsB'rl,i8Ee݆ XI~^h]'KEEbFG@HOpRC=m_yqe& B~EbEf+G$D@djAB[V݀&鬧I^\i=],n2Lǣ8QB HU +gi%T0Mmɨqr-ίדp~w7`prqs޿qzyqv~s~y^8og!eH4DʉO%l!4yl̤%w2m + mS]$˒qdL@(p~TA52\M^ًr"8 pdjZk8@5,}U/Q{PFi y!9RƬ!8L̗):t 1=bDUDۃ1Fl=1?aL0R]Ntƛ``M4iMk PDWIv9Veb(I"wCl5[6eY*B\ dOR (79W=Y 0;pqZ3Æ+d|c@d +}yq(Obdq6+gaQΧ舕Z<~th ,}nxC/VRljo//|;^E+vDFu&Pמ6ȍyB̕SF‰5=$dфj,+ a0pAfɎ lK4z|o>CqTlooܳm'/Zw2z~zDv-dڲۦacFrX]TCMB˶e"/Lh>=|?, l ~n3bT5El\?=\`='ǻi}G`&Pz @x};I{%8I=ARSӞ7 vmQy0p$JffT@@8`SWv{Tt;Xղn!%=`@tORlwN247E@8Q2)SfmX8D3q Th y@REl%e0=ú]-fs>{}ּ%oác1MT]`kaM{I?ڦ`{~b.֑)e-pw+n^Aec2ֳa[ K/jL*{?T[LAbĥ7hL|7öPƆO + 8>c#@W`XYƀ\}yv1!@hb@µ瀭/v% 0J%'B)̆ꈒ>0dlMѾX?)P*[UUi8鬾Z]5u5ѦqIF>k]͞,z͎S$kD / І0b;5yo>8d]t=U*DZ>% pwtFbrNiFVH T{5l:<,]2V=b;ebFBr!Uo*FN ;|)H0b3bp} +J=e>4ތK|-6xh3U~s]h6l"Cȧ&a.sj*~3YePd^Tk{.ÈoS dr=`z +o9C>AV Mx[:w9?ˎP] J\`بab}P +5t +>swD<>>;)v$Zxo]վL}c~'S`ڌ{>A.e7f1ƤݱzMh/ĺd%1 6E4)6zY:5q&Ӝ69njc[Ud;sR$yL"EȤYΆۘ}]D&oMU0>aRL`m!ec0Unwi?;07`5;[AcEMAqL@w&@ Zczꕌh`2{Vo@ ѺFUgS VVb6/H W + >J/rcR9AYg7>54?ҵp' pJ6u~ vե)ͮ2Y<wv L/s'+ /ZʌJcϨ*1ip!.CZwhk 6|\wDK]jXZ$UG8 T]1UgNR[RzK}~tEW ġ3\Z t@ٵ1pÚEyV!淪Aag[>r<#l)jbUb$~>f '+Q(x~o)o S]qӉ̚u] +Tﱷ&Wv/4 @BVχjlZ:y|eaԡD1 ~V`pT@%:ƈ'EDu+|V$;f>rZ^]OtwtJ" .u8 99/ +H@t;ıՖu }&ޖ^A6%ly{zoNuQmaVJv ?9 +TVhhkóÛWMpqS{cmZ&NYZxMRq[Ft[oJNͯi\.W|6/!rS?8Ƈ䔅m{[#([Ә{/=-_zس%< Ey[&Qa{%IM$]h@vkNnjPK%^Ias\);lF+פ]UEp m=BcNT0n"fj՞}[깛k*wɒd׈U].X &wi_a mQfAEoU\ 5=x6*&כ ` ʘZPFme==A,xHwh@_ndLA2?<Km#LSj\QJ9Xe :ȝD+" U,)ަiҹ`AӅ}qDUt썎;LDZ@.Ṟ|geo+6Bq;|eDf!&[ٛgtkS7yyx!+K68pC+Ԑ=\l#z&}7Yy9eqrQ_!aHE{s],@ iȒ2?~{\%˩,WQ[< 9YۀzenZ ~=.O4U6+nZ*7_R]~ebJ0JV|6 Z2ZKJKkF=%ЩnEg#^dU8J.0ATyfC؞֪*; +(( @"De>h5a hb1&M*ȃVY2+|-|U?o:zk_ܙ%ZNL7ub7^K(5 " ҌrI+,*-K8u*ӯ93xu| Ju{fQd}" ,O@/vFb: rnWmP| +YNwK/Fak #炙I#KU;jkȒJ9+{/ 0*ZGrH+qL |?|^N'7x΄к]$Vi[p˯4x.n5wt0^|*^=~ƦN `L靃́x`Y> 2:4\:ףxN~^"eQМn-+ieVTxw els.\,QpdYASСM_Te">I}=ͮ#c}#9L\RzPY v-QVfnn8DnrZ+l6,A ZDeRKRQܧ!%JCQm$>́!}q,FÈ i\Kv@5LЕXj g jP1}DH%76M b2*3t]%ˎTGVI%Zܺ\ϢlRdcL ȤwrFt|{sƪOLФTpx-u(c@AS6"Үڨ/!G? Ô6Vv-~à[gRXJ&Ƈ3Fƚʬ](E%<jLע!b],kt3Hݐ(1#vڅd^]^%?j>&%CW\HFLE!SC6bYI3 xM OLUdqb62WC?ȧ}P7nt[<H.%YJzak[{K<~}W]&ރZ\Aʚ;8C89jgp}Ӈk)w{v:*3W(]C(E``/ش19:Jbx% U ;3%fjar8(sOF= Pb"{p;*x_tm披zrU^ts| wsIkoFߍTo0_qBZ*F}luZSCWSe#X vf;K;' ؾw޽dzrYvHh/V:D_\84ռB8wqfq$^ D0oΰR#SLa:}M1V+E"+ R?W )QK:>‚D)N- +PV 1yiʵU҃5ZT%1tq pLK\צjnwbpPNCJAgt2KB -CtnjoA̜ "P=s4ޗ'IR@I\cnuΑZ?*eIDIUIA.BШ` v,Z, DQw80}ϾLogp7Nf7p1\g鄾F0sHQ*|*-J+َb 얶ODJ=W"GOaRJ+帵+僩x )Lr?2XX:$I>G$a={/d-%jbe]SѲhnZXUp +"[Qdb@s$߬Si>y6fݡـ?pAl`PEO QFd4%n֥|~n}R̊?llƜlԞJ2{xQ ߃^hD懒ҥ~rR/='}r{9=H:j"ߴVVY5=F~9twxl:٧TaO0_q(Ui}+jնV"eO\lMݤM#Rƽw޻;*0W2!_2'J/1# +wo4U>z\1N_Jm4T2aG#WԠ$:P*)E\[:(6eDi Bj)tD 4# 4J?@JXW $j̘NDYnA5EENJ4ȘM,i]5c?(q@ѩGl RY d6]"VV`{tn[8޷ITK>I6M3bH,$y49&Vh <*bYL\ ָF &e6th n^L(̢\Y4v w㛛|9Dz-6!C@JSb*SMK'S!$Of52CƵɄƣq=mݖ|&\*Iౝ0d405|2v{ow-;N*ρּ6ڸɤ$b4TݾWo:ϸ*$ɢL lO2xQW/Tt1V!N\բo@۴W$[gfɃj f%yIZKӭV+"nDo*qHt !/auvϋVVړ9?oaa=r[~Xsn +spqTao0_qB +iumAEj~LrNSVwgv"!{wtR, vHfVNH%U +n?SaqPYD.U2|pq&%8g1aN{1Ez*a@Oě[RPi J%DriT{" 4 +X+#ӥ])4v) 7c)Ѩ!c7uZʞ=FXhSZVȣsw}.ˋL +{tn[8IK?saVUp_4l$I4|O̍ZR| VLT +4?RAs_?ؒ}n@Dv-O:Y#{wy_0ً?.~pFpV'&7"! 9[/Cmo@^57Bs(na/JǍjoWTe]t|M h_ ]|xvk/ =]Eex̱v <7-m+7,e]/:X'TQo0~ϯ8iJ&eKYJMG7&;ݤ bBPU>)?:BȤ0 . +0%~ΙF{>e.dӚt3s0eȵiBˍș +@ +jvU_m ]F`BQ=H]xFsw8"rS֔9Y\PvD,PaTnUf*^d+P7T/RyOFeIVn:)՝cDV5 uéCl Bh|\&Dn*DН} x%+1`N +0cPӼm'HUD17BɭoXC2"km]V[`ئgz$}lcG (yDrq]\q ,0[Q-b:!-*/ƀd§FYĔ[G1SNK'`<#yذJ4jmk5izUa8_1*-8RGzktT~Lbk;8j8- {3ooka!J )doXi+VCk#dM) ( kWvcB2c6 +kPZib\(ryťi 6r38$ S`hSveY BBePtkT'n +Qy,OE{RTŘߘ$:} # ?262EbU] +&S=?IԖzJ;fM˜z]M% 8]y]^M%Z||o.?xvKGZd*<;@n<;<,琫\ۡDCmdy^t?.| ]svݹ{Ô ,]EV +T [m<[sfǨ`UkjD9}r0\f'OWm V =0NݦwgEL1RLH_ +ȗ(Ԇ[A!4Rc`mBf/PYYg.3:y6[G!:D#&xj.\UQCb/lf7{6ӧԵqW~sr +d[04xPZhiBO.(Nm;o+ЖZO ;W_-+t[QJ?i\{Ji]]Vzhɥb[gOD/lv wzчq{^Un@}WJ\DqǤmJ.T1ih14; J3s̙Yʽc"DZY!T EhX*ZG[D( +B2P8ED^JO42Zȴ(-uFAPb"|rqKX5TҮ(FPiKJ%XriTt9" 4s7F&+ Rh̩ޜ[ -Nܖ^7lZ9c?(~ yN:PBY>;S,OPC7jǻ&^@V@/@XF`em~UU #<& o4zK[̍J(H4b"'VXTTeC)%\C85@*0^IjAJ2$)yGlwۢ֍Z){d #"~>. zSPb2EbyIC{ msR@?bu]#<&;{, +CRe,1[V`W`l\3VS]Em0*L_]:(}yAȃA4p5]_.*X,rF0_d>;.~C0L!Ln%n +C"xOrK[\%Gy*X" _qQlD1#֙GmK`):>x!aHk_4$SCGBa4},)c՞fպyčtDjJPF&¤Q^)ν;ǡMV%?nfvgYh0`SAȴrB* +pk ZeNj%6mҺqO3 damH# + ADl"zd/&"ϥH@#ݚH 6"*ro@09{t5X;ЍBcײl%vb잸ۖnuZ9rc?-? -`Pzt)+;/3%aeBeݺ;A[>V@pڹjEMӄ )btMMGanj/ *R%i݈;@*CWŐѶ q^I$ l7N!N{p>Ntwjv|>N$.feg =Ma3{\d>WMR(ONK'[a&W2#{EP'4~P*4ZK"sG)e_޺)F~d*1MH J}*.oGQM]S.9f5r8hi s\%FX{-G?Oޡ 8|^ +9x| L9(l޾IRtLƈ8%qI{R1(,gD{fy0yd}x:'¾_JghwXn<0L#xi9waq삳oTn@|+VRcR5%Tb(Oq^){>ǡ&D !rQl^0`s!HPZKQb,[ 05zb2{X8e4L%q0O%Q3bRI?YZXt"QGj6TJ}5Q$Q|@iz{! +oiUƁ5r +:oVy+ǒ׭+M3F'8sqPLrIX^dJhэ!1+!o̺[1犳 z,౱iZ ~RgxDaYR~W"-TI"y~P>q]!iD- ?$0$܆%N'2Ű" +"9L;F §² Rtj4s* j$i%R};"jzSus/[];L0{!;;{Ekù;鎶3F_4#;apvTak0_qAc۱.Mf6ӕ~*|v:'u;N Fg0ƒ{ZUQ|r LU Bi +|aO(U6e~\ +&WF_BaJv7dT IajjvL|FSn9[2e +7eTSǁP\IZy@ƤBVKdFV>4چ|!,,<ǂ@a_Gql_YjzP9⅙M7Vz=2+ b[DysU6h;7uoDOu:m-= 46o6'V:ڵ8|ZːNv<~8%kULowud/ipCc6A/DK6=j}R##j6=Fst9 TaO0_qk}iVډ!>!qlC9I MR{~?Y9F`!s\+Ǥ* 9"T,frY;rQ:pzE a_1GUw̃L |3'Yuh`Z['Tߺ0x`x۠fXog* ]A6kn2ڑ3 +@b0>c.{2ϤRܫ7/H+ΓSi482Tao0ί8EDY6*2tU?UUmJ}giIݻ. LB\I˄2[ ~ ~ժFmw lX[$CJp3'G5tKƶL#Tӎt1zD JV*;ZKe,׈Jkf)Ob3a<" +[P0*bY&\iVtPy".QctsU M!jrR@tCYҺSM/@uߌ)|# 'SKoGS]He1LtXUI{uQk7=`^ +a0> ömg):Dzȹ%CM=^Ċ5q-Y& @,ZMeczi@Pۘ(J!NGpq:xyy:JV<5\,x/zZ@ܹ/qr9Q)ډ u? [9Ndް!WzBT¸"=*a>mo'jr{!#(ПY|Z rM[m!yJ xhsE3Ω42}AŦƬ5ӻ:Wl<dt5!Rp"Ej}dIf8?|x?.ܗ`#:)Փ_BGbGEy7տRFݚJsn?[78TSMT-qMW2 X$C Ԃ|KSj!sNNOQϠh;*ۇ_Z EΤ `S)orB)6ud$(O䷃}(B]V݈x i}?D2 r|Y?F8.BJo4?tbUWp{v{ A[>E|b4z4^_2{,_69X,- ! m 6g}p\ T]k@|ׯXL!qǤ4u"!O,#ҝzwDдc3;WA80,RJgbQJ*[>X9vNhO],f4H+;X"YMУRVA2 b9@z/aG=>őF=H 6w#*eҧHE% @0w`dweE6JؖOK^ \wŘ"??Q+z\=JbSy~[?%OB%SI$I\gʤgg#@͖ CA6IaU;#nt^v_㬜% +Vn1_gAT~O + ΂2nQTIҫȃ^VBO #7mryW;ZwdЧ'K@ +V+ i\Ex|0a袏4?`85PEaD5c۷{$7ɢwxO.iK2uQYi%׋rPi{prEoh^9v1m 'vLDt0&: +Oϱ{xKiJNF!]$7 @Gv#t[#-| y.(A*<4X3L{#*4v+kb*,]PuS9a݋1O) +cA~u8y+4Uu)|tP0~5 zs h:W_q۶#m8P?b>%m!{5ĚFy֐⪘r &8mQn ل0Ia])W-?>Km +;Y.W傾f,>s) IF6LJV? 얾OLndFTш;4Ph*i@dJ:o*ˡ?p O 'vCX Tq{~f>JalmCևv +w=~Bwf'h2fԾ8tPۀ ?pC-p5$_frDQ$"FTÅEǞ^p _ >פ_cVWHg Ξh^'sFg+H\pXPr pݡ[{4Bs.On{Q{vwW1WS W蒗{ L5? 5b4*d^L{A5e9=w >x_3?QC &o[t=c~E0x5Fz!]:1R59$:VcIZʯ/:"lAGsuFOKftf[|ZY(=BOtl2g4~ $<8:h6:O(ĔFzN 4xcTnF|Wl>؆*}m5BKp>ȫ;h)=@E+&ٛٝݟ.egg3:QklAdO +|Wȏ쯟478KR!%wF St jcSiZ;Y֧W, yn澍P IfÒhǜook:st&1:T*ύ\*2DD sQ]{S\gه4o/RvLOBkQ c1;? 4O ]8UtAn*NQaLkra叨ye]-U"t&;Tv'{[q_}O+Rt05*,:b!0em/P6z4_hӛn[fV~s[^m-ִ~oՂ%UxF* ?M-cB<[`*Ƣa_ T2j[S d҇!Ym{|HM#~tԕl bGqmzb9 -a +M&Jqx(~HYxVUU4?)tfRhVpDЕqAH#́j,$Hrm q,nR'Yy|أYP${IU%.dȨ5F{2Xt Bd"Jki#BkY;Om|0{@ ;KT*VŠ,wGs.GWj1Fm$_ e?7h8N̆ц%׎)҇o?WEtϱeyhNQO;D/FA 5[~~|/}i ̿r޺w+_ѯXmU‚0aA >.~U]oF|~B0bGn2BԐ Qip:k;hE);{$m@`<-x]oArv63J,\FVZQUNHЧFˏUhjD)RЍjk ~ ƺRN 6Mj!M 6&A[C'QMA"(RUE)gez39?׾[hO;>2\siQ68"Nt.צ@zt dwF95-YJvד-p_Z1Ē/Ư4Obv%dlি,U@ĪȘݩ{]xú8!ԗI"[W$essޛRyn=^I`%\K AEΡqMp8!0mqFIFi6,F!]_҇b1-iFg2tG#gnG2Rk"TsGU~৞-!(I9fzaJh*ϩߒ7}=')pQD$;Ƶy큐;R;$%\; :.Vtz=<Mӛ|ʦ( c7tByJlpp@tNFt<X yn:9_y^`o_@tpLpx|2#Zc_dc~N@V_EJ}G%bU"'ᕊ;g `r{{(Pr>ڗkr+FhW:>_B4_#j-ȩRr+UVm4Y>娀`{|xfp"%G`v_>M3<3va%<9DQ)./9q'Zmo8_1kkMl\&En Zm"2%H%I?nu( _DӨ{/ZP&LH!'L9/oLkΒ4 +)4T܇$ԝ/"p,X:LJh_ 10Yc1Jl "IDukۻ+4ʌC"b`0F(f 3- >i*iBXMEݑ*k'2nZuVHWݗ4i6O[ Hс/=%(. +6G[9P?-H8Up\,`$IX,L Iϩ{\B1dBkm>{<QY j{mEU3e +Y+'1^a>nUD,Mxt^#%SWCȷWa-n '_Dޘ E].8mh} Ĩ5g+W?w_v_mu,o {:s7Mi_A;~0=T%R!ӻh B@$Ƞ Tܿq1.sزp0NG {>g1P?XYFBD@Apx™!:001䩄-TϤCj[E~Ɵ Y֜4^f"y7lƟ@\5rQv_4 s A8]-)s&On +cLք *&,.st. 2W6~E4@Gt/L! ׸[fwrƛ2OuAPnv5c t)f$"J3U^EЋIW7ۼC1O{R"\ϛ~p#Z|{0dsTF:l5|S1n {h"Bb^Lu1@`mǗ} ?c-]C.{{S$vDQг +Y㰴-:jTpAAK靬|el՛A*Kps˕ޗC=G)e`Q8!U,e3mR33mQ1kz:>ɤV儢<LR8̘br`+ +L1>iSa"W& چKgx! }7*31ZW%<7P#ͧ <5Qgq0Pz¡3hX ]bMJf)/>+KUմMrxQ'֙Ry*R4;Q,Y6wΔnTʚ .3#6e/ yU8/Pnl/&q/l %oZ|oc^TŕG_wozmFy 6JSYL$}d(lvr7u/~?`Sd,MN3HaV&yM +"LHr9dl,d(a$:@`sIJG6P< #ܚ,J,l\gltLΣ%wdlZiIq_o#և h_iY欐S 9 -qēVkOH:9D +K4s\36WՐ4D6kBJQ<_V1_IP*'3WKJtwjޞxu_뻫1e7n{v~; `l%FQ:dp@mrKD(Yg/"KPY"[DE+cT6hj+93J6>jLLzD:r=mC~BnΤE@f + +$?-D>OCR^UlZ$(_#8d")1ȵłA 3CuOsJ2a+cذ + Лp )}#O_| s"b _ yQ,&!r&ry΀F V3`0KßQ>M=ƳwvO0zlǚ +(8 G.)L ~( G$44iWZx}! %v;D^dͪ,"^ͣ`VR*Td\ѐ3q/>L{fLf?23}3ǯĴ|%eøZdg軔lO|@G~VNioD7Z:lȖ雋ޯ{2qhsR1`6CK#V- L0Hct jH2K +f-qoǒ?RaT  +|O(Vro ,|1 8r)|%0~l#MJc4O!V'ьTَ4M 4Lct%8| ]yև%|!h \W'a}Y8Kx8|Cl ZM` 's5F\{ +uefW쬤cNVƅJ "U,p*~%߆Ws84,%FSx)t;%O=\3{͎pttWG >{s.*JC)}ʱ?}WɆOZڏ[~6Jɾ=q GjFqZNҵ5n汌"̹ 2҅\s6'}sqt5l FĘڀy&来 DFi7`%u[V*BZB jT&Y(`@*-jR^h5Ã-x;d1H!Zg;@"rE^Pq1YP_ՀZsձ!jStu7vX!'K(sLA;IMqtϽR2;gИ꭫K _Ϥ{*PX]k,Kó"BU'Ř4K 3k&]<"Ti?,f, M/7QgG|+;-6z6m=%5 S3ENs"]RQ WO 8q=昩io0?؊q'a)Ә*}+2$Xaz%'*˫GZq҈5+#nxzC˫H>\DH],bRճ~TAx:u:-JսWt=Bd3D x% -0sՁioОXv ϔqn18)V_859}YhW{,gv[nA?&Qn'T%[NCXp}(ӄ CNrh#IoEQ78Ֆ,O]y3:ۇ|*Z#F +Ipu4RprkTuALQ'NK=rjЩ章..x +@R&75l;6w^*4˝bjauog/h}躥b&K}g 0۱f[R[`5~>K`ߐruĢgP3 /@3F> +pA9,ZןHrVV#-B$ (v&ibER,&xdjH%cQ_W)H'`Z'-P(5CV0 '1 +KSWDf GiP }Գ &FĠv6~j'Ͽmk'`W`qm[ $iucm:ϙ9^+U=Am2~3˜91{suV|-A5{F=I-E>VdO]%3_nݥt5}g+b7+J!t.pvx>|T6|9Й__T϶1fY4V,@SRI0[穞Zb /^40s^5'\qhؗs}-Sa?*ePA+Kգ"3(2BBF T +mN%M? J=OƠ!FiּҼO;ڟvll OwRf)J"MVRBuI5C<+]/q'hT)1Z1Ȃ1~r\ewB^Ť\dT~ZkYK[I47U\ H|5 +}.*!s€W APA",DK=^3%aÝ &}zO#$Sv?uΣ|*dJ):L^6У]6'!\ХVρSvwPa dS<ņm"mivC^ՙB駛 +#[-W)[r1OW$ 2z4_dKzq; yf1=j{$K 6@e Vo[`vܠm2UkjT<֧JW.Nkixc;jk>Ȅċ@ {.싛KPrM~|U31ށ},<S>*g)M"qD)C)í-cp)'ŹV-w\ Oٱ63;s,ba0{)1tIHk$IUxnfxFkی3]78nM^2f:WV #N< +_Ƌ:Ϳ&cλ2G.j!'-ł' z|4`mkuO< Pz8T؈)}}sоy3.dEK:uϊ$qވjާ=69$MJ\QG˨Hk:1]mL;.v-OGXɯ*^\_}{tXnF}WL  E,(NF&va9 0VچewޙP.vS\Μr^%ggGpע*iB`3|,`QߋK3 K⟉U%3fN?%9i+ iZL+ +oX9_piM`¹3s{?] ]$L0R 2AG )j3Qt*Zs j%6sQy::cx,ƺVUuHF~GCOtwϝA* S^Zt[`2u! s0T)`.P0K`nm9HjgyCLcfo&WQߕИX^llEtr@/V3.if6I.bMLs5:N`<9wx҃O_n?ç~|5;<k|&_7?c(Xj +=Q5} :b&R O9jɵk0TZNfTTwb]LQˀ$aa$qb|{LbgRdf n 2^5V +VoQjOm"CwvН2ٰb + >y}1xcx#]jOFs[i-$&~}ufV]VH56'}l᱗c4܎~tޚ-jҨ &-פl"t} FR*(ڢ1#Zn)#` i83!JkZB:> e,Z0d!TUNZ7vc׼WZ`;֍Ǟ?ދ WD۞qyd hpgZ5WEz +`uxvFO:kP*.Ve| U dB-JֹPnO:w6[˃tKcV\B '_xٹack:: +Dl .YQ⎍]2jL[/.nHxb,GXXC#cfrVՏXFQlw/f 7 +nqj޾X||9e{ܚ-3a,6s szDU/gW?tp'I`4X8Yޖ5R[ak𡷔]r~q\sK7Sq枖_S5"56-OGߙƨpc''B>D}a E6GIKcrO;Lq3b lHeB/T %im?oJY\#+{}n"=Y?٠k䛚'-X ,#Ͼ[m>T.;$v^&̷i/k#1DJ1W}LsnsW3OG T]o8|X}Huc[1Nha{EZb+*IEq߻Ka$ g|񪫻Yv}=kX@YPm*5}UӍ5{]&7:hlWrO%? +:MrY_uZ7 +pzЌ#j("zonaϪ_j?XC5`g3mCQNWu;r﷕VUG-zYדs始? t1^\=`lӉAQX. kFQ=uw܃5~HN0v^-:Y ð(xa]w캸E'{Ӑ֗^;xwXkmp*ǎj.hBp~L'ӒDnmxF^/Ç|>,m~[n676߬mGAo@loE&XG4}<Ǯ;l'mM\Of·$O/CwPF_%72ٷ٫Tao0_qNA|(i&׹$flgY9qWTE}{wgmN Jh/V_!(?zJ{.P %VHzd+\xe4LjF6c{uDi-2lOPYϕ@|Eg;(JEMi Db)l:iVkR-ݷe)*qpM7J9R=6c%^)࢓qd6T7bx>>Hl=%bM[+e 7#ٱg 01Py߾I"^[&QbrA]g/t5:G)K=AJ0ԢgQ!Ģq]ιԴH24;,pnlp\yKYNfMo+Xok<UZALwm: +:-  9enຖ ֐l*2(i01c2]3#@P 9dT+89iW%ΆL:1GFg`?}QGZ+i,A_yA\cMyBD FWyE;F*=kofe+a/<,jmGnoۀ2svk29{? Ua8_1ZDZG +lEjOrOM!lqnD]33~ϗML ]RWL5AiMAdkov^v&۫#itsNƔE2v:嘖5 +.匰dGHj:k6cERc?'JcfzsM{bt:ў:Tk9ZU:DDžrlsp(΀h*r㏅c`۞ʈu/#"@.1V26P:]M\J+؝}Tad˗ y$]UnfޮSЛjڬZbY2߯o! բ(#? -}|Ù LѪP4j sأ!Ky?% 7)%7n{$ 6I^=d>LߊDzJA[GW&+xeB8P `+PM tY +\VF3ce$}4wcS(8N6,$bZ~DEUgmݣUq)1k:w]MҢ$<<混i-8+#ZY!TK? +baLZ `3"^BdW:WR+ W]V:Dg>c&繥/b2CLPY"T&x?*6"i=,(CɩE R+3\,2,Baf"R21>pz]lu F@Q tȀvy'bJ[ n>Z* +KX +8ﲻusDyZ \+u3 6= Wp_gAO/_SѕϝB\f|"1ZcQݠ"#ղަ"A}LЪ&܌)mx?=4}d2FSb4݌ ǟHQ*|L3n*(5>U50[9X",fN)f40|mykR> lKdh WLnH51|pL`OH!cv5չwg*͚! +Ny5Qޮ6c V4GnU'THO;&5"]:Uy̮b\ԮzP#:ߝYyFђ{\|e5=w'~U*FTؔA?3VӃp` +$"!}rtxy*ؚeJ(8|adA?lݒ8B,bVrzfA#cD~x5]f{_̎XIa{+CdD66T8Z8Y+9 īdB&\%3.,պӼR9qɇݗТ lB! 7xJ[$gI'cpUM,o7obRܹ(u7:V˗w{<ȔK#D? +BKp@(5^[$5;a؁Yv "Bl9M3y{T"Iy=mr&|MBZSND9||aC|'p$v9?%w/X+RctDDݼ6 _wZل|.e!#GrFn;٭:"i_ 4 nP:W*of8WRxcO|٥iDBsRωY*UN‰A}ϫHs&B:5Xth l~-,pwQG ;,Ma}|lWGkH0YDZ'Jz, f[3H̺]i;ڮnlֲiGCMׄQTݱ/a)4;3'\%Nv(*kLW'ٵ}K#lKfǵ?:?tXo4+s<[xpا͠+07Mfn;d>omکQCɎ^>~S%m]CE>Xv5;7b#'woo'WmOH_1EIP+> mZ@ +mo&NY:tݙygf׿*t℃gY"o =W)6gb3 &d}{<kq<3dY^f>SqAo<;>u. E^ċRIX(8Oy0\^'oO!@dDzCXE'wB H52f rX+5aK.X +d< d-eZf!b H5`2ۃ7d6Os4O\\ۋd>g0~!&ӓp CBP4&FГ@j1u 0,,Y!̯нQpƒJ+HcE%t+7%䊺Jqm UYz6kХk[W l%I6W^DY6z"/N)Τ!}Olc!zK51j 5 +#}fR㎰P PߟWy'i$XsVęEW-D|4vC4_=Ee\]a8z}b>dKS &WW㘟f\3~h4Hj +*əE!zHv+KJarGM5Գ)EIճyd,5NjqE]U3td }0eG=¾z: +} eR/wht7Ի5jO5n,v%?bnkN]6VvϦFa@9덺Զ3åR +MK**h[ȑ@x՜w8Bzg#`;Iz 7 +GXW%8[YRV:7^Cp`LlYOVF֏v@^Zc5Bn4E~ysQqK c؛Yk^lv42_UKt]jEtK|yFZhyEU D[sƗ3jE*1UӟM}m_DߥuoU'ھ'HzJ;}V9q}" reD |_ C5@\l{oeTn.|ʊ|6np_mڒX7}V)+ͬv)qiv^wXmo6_q R{eIIgu8m C@KE&UJ#˶le6mlw{g$nZpW")2! !pzY¯T($bZJx\&܇Tygt4+I WAINJTi,"X9r&]Fvpq ZIH0׈JC ښE $05!>9xE8IA%Dĸ-2ʍI|[u2Jk1CE H=)[T)d /xh4v{5`3 +ˀ$M&i.3w{Wpteʈ' 11/hhkA(CbqtDtac&F F?뷷s.Gp}]A$ _Gp+kr-(+|m 8%1D /0S?P/˝cYh5E81k%EiԗBwS*RFd1hJRP̸,p.iSNI@No>LHZWe҉V"No,JM;4ȔK>X`D@B71F8Ѣaw,xhYz +V,"1;yA4 ?R%]H6, ]e3bzrY r1KpzN!QsHM r.w\H[:_sr h)UQZcԔ4$ + i 1PY3 *ZUYEB*Xml@ +\FT80& +Wd%?3`!}/MRZmf)Qnr9 ZK0a72n1\&BJ +}ŭ&%6AɛbٶM>榽*MyԤjjK0iKnkDA]T:1p|N6$ˈI9 =a&\V|QMIV%nT˹s[~x{FY.B:7%L1<.:B&[7Yϗ2Y3c7cM&BՄ`,o{kiMknVB*L proJk*7K1̙6ӧ_n)dys!j~/B'_n6גswK/ilX] 9}0)s<0ʫVbޙÊs-J ϵ&5<)X-]: WuF9ggTj@+Cl\ؔJbS i)DUwWQJJJ[Jh573A80,2Ja1u܌8\f,j_7a '(]^рV@MWuAB EraC8?#t[ZmnaCP"%%HE'‰ arVzgdu[neMV,%] dl<%;RTfL 7pH4꿎G>;PAc>]"Vե*ٽk/f? ll߆a۶3 ϴ)AbxN&r.U֒[_iDM2&hQ~EkqUL9Cߦg$}?lG(8I +(YpLULmQr͙l +HQ) |o<-}lȌ䩢B5Trk-i<*PYNI۰%[w/hEӰ߮_A\R~?__!/τ6\󈟍&+._҈dŧJ܉y$ EJ{n lKƢ;쀧= +}B'Aa;|>`|`h-K;VaoHίE>4 * +^U*؃]SͬR ;;3o޼*zE.`* D+'*#䝰ȦT5Yq )crb2Ae1Ϥ }zaVpR+L' +[(imDA,Q9;}b9 AbT֏4tGZh i*9(@*:(=v4 rvFf(46[r)4mj+ꎌI/a@鬳 _{R@iŇ+Gp XYR{wsƯ]榁^؛sի(jf,<6YJ>>U[P%bMX p}Ecq遴J?@ ߣI MY + ZdG㧢BSJ˭2%yyQYv}R[DyBH3Ȣțz~? +”ԉ&I)n &m70QQqLTM?jz~<`*ݛ[нz$ahAa{$! 1b7`ulY"Ykαhީ.׼~B*w2pBϝ괣y;rxQxeDibzHymYh;IEQ>^ #\>wtPv20SEljxVI>x] N'/Gm< +ms[wꋫ>l[tQjIn1-V%NODM;g羼c\^${Y(`?4ίB~Ro8jeѭCz܅'_7Jw/DjBhP$)% @EtQKt'w +^.d H/[Le?"LB|=!6cʱTϏڠ6ڟy`$/VaoHίE}l4!*"LMOZŬb8~3^0`{o|y+8;k\CaB +Ys?O3B7BcE]˂`,¯PL4+Uʘ$tU'נ$h!Sj,13.#Dsqi>@ȹM?#X!WE@%ψ*`X f)2K5OIfڀ$Z7')'SnTYKiу0I:xN'6:c@Y]v EbY +&#]b :ZRˀY)Vc Eژ]TUgp_$k$A>LyQ`)1,7rd%rMYE@ƊˤGх7AMy(ylN!4 a矧_u8 '( .|<+Nn)KP!$ +(~-uGb%"'%uϵLIhLkB)徣T4M} `mΒ ]S-?edZh 1_ f_?؉ +f.ǧo #}끝;f* !ԭ.pDphHI00-Ɠh6^޾oIK^2~q%أo[ߎiۜMng!6rg.#5, ]gx4LdR^.@q9E9DRk|)|I*MjI>q .yI yIme=enQ93ͲZxGxv䱂Jby%'M>7R >828luԴ7cN@TOwɈoo:eZ#úU.>546Ke=8giɻEO;:Qoˇ\icV +|4K.3av]E(ΚqV:)ڧI7o0L68m8WImtm-Jǡz{~j;umhGo[yzj}8oYr6}W`b;㚝>6m՗FXJEŞB͉l#"+0 WLFszn IM`kc-B#WotqE=^Ѭ6}ChZO!pGA=5D bQP6 IJ`{ UH`-F@S"(Z [`|EG\HQr<~Y.4#Y7G2K|iI tY 9 +[5H8߻a6>Ϥ&$6 +P =jw5 ȚkW=.lo7ܠzb >i3\Q(idf] 4`7u,1\Y:"BQX!xfz]Bb;o*rLjb{[X *xkomfX&79֍JWKg4~Q;Q?$ރ ?烞{ajwaumJ{ vmbH=f qII)<.(#ۥgpw)&73Y &WթM;^.s}!R*xRk!w=zluG?Xn#7}Wp?ȣ' "X  Zulځ}x{KfdNnҳѻwg #rŚ #Z&Ld&rMj=c&4[#81|b^fbI D}L)JKERc_d$N#kؖ Y(Ɂ{n6kꙬ@].9Mt>Gr0'S람?&a^RNe 'x uF׌))S[1\=XRim#|6ͥLǝghDk;]Fv)$vV%RLLYNB㸥"FJH- 22C El$kse:3MA&&*a.cw 7h—^%,FeBK/STԁ(ϭ!{X@n2ξARqf!iP. ['#*i*p oII`rR=t)M +3r[ӓ&"KAi13ifpoZx5\h;~˘T,Fȳ!'I:\2fdv{DR֙1r.s/玷z1oĕwl8Kr԰SCꅏ]+*NϲʄK]evim\Yv=kΠsU#SJ?X1#\Ω~mѢ _ X)vP\ +hNVȼ<)o9p(AĆXibK=>v (Y-G., .XEdT?' +01B r!MH…)vpp:xOąsg,l.γk))=t[mJؐKxkFg7f\>|Uq~4I QȒ[WpʗS@+b9G)fMXIy]~Xk},Q(uWmjJ3``2?)vi;iSd 36|V7/epGopAzJQyuӫ ^}085;0tNה2.Rȍ0&old}f8Cކ#f0\%>tq ^A:a0 {-^;?/BWw8<#ug +./ *%Cmxtn855rkz2n#>*rD$^|i2ߨ4r:&bs,$+U<%6OiQ>*vɢܮxWe1Wå +4,` K%o!KB&c~ bȯ-]9,3U 2;/(vUcr̃+3TTIܙOl=]}_ +1HjDaycNj8h-0 +Ba1m`)dZ@9;q=jv~{|^WStΌjG/DUﶲU)Ik1V#7t\ qĽj Oή;_kbqѺf")eۈDѬWy ee<ꇆXc辝퍰d@!\'oOm]-nJɾ6kYUsHYZ^1zJ:|^OmuoP`i?t }.يBo7 zqNv(0}_AxTz }j6?Ap}?Yo8'](>Ml9MQ,-6/8" I=-;-iEpyާh{>XH%D&KfVDW**ʅ6R%גjɢk=2$#h1gFe#L*OYrȘJRUf,7"_fBEb􀱉~|;]ݰȋs-f{f=ģyd/$fbɳ9t0IDW2F[XurJEkg#Tol@D[(r-JL<9 пpHK>^}8$105<_ l#׏'w yܤ<щ=l*`gd%L@Y# p_$" @(Xpmo[LE' ` 9m@. +Aدx`CX6] LwpUؙ0oSRe@P4cرJ @_u@w Xߒo}6X55 1Mc=<%1J=vGŧ)sOʉ|sfHAyǖmgk ɔgv1MKswM8_K8+dH\/^eMw,3TVk  +<*SҖ.򌯅A)(^cԸP.+\ oVj>hw5V\GL%Ieȓ d<2N rN(a}:{cV֎O1}O9 J +Z;dE>7OVuZRm;"M4 R1cN8JZ (NZJDlG.j*cs؍(MV¿Mv31];dDӑʠX"}]~|,e{2k عUDWo?̐uY_OO BH:+ 5-+%d<,vI# =W^luĂi l%<?qd:W Zv9SفpA+'jzz?B>aw.`gӫa^%O/ `э5-XyϠ̍N/ +'NhRjT@_[*arcq a*S +7nj!>XT0S3 fGxPcB,P[eVyV\xahTɊ+`DY/5Aϝ`|M;mx +x8QR5vlѪ)Q"ŬmAf* Aش+x{ Ej..}/h\v ;¡GsȂn^A o~_~! Q`qmb~"p]T06r{%|Wm*Ѥ;o >/*QM:sX5{A`mU橭mzCզd'OS8oW@{>s(k$gۮtdⴳכpW@"9I^M ݟ$ղU[}&Ah]JTƣHhgR'+C?mR>it49tݐ`Dc~ =gc/1AI#ā;zz IvNG}J(%rn'v eZj +>"` u!K7&~.~G `2VU;)^:Pæ50C'mTbS +Ay誰O]yU-L';𩛪s[|`;j} ?<;VplSc}dP͂\*?/73]W/G5ukrӅ.¡ڄaB iRu).Z-35Ze~0܇zwt/ Y[o~2T8vudT8XJ" jZ^-p 3Cr6DY/ _dt~~ٍ TbLd1L\$SM$[c+#eȍ,y AJy'd"dF5W+Z'&Uή7}B3iZ.s[GZHL6dl..ۑ?ҬFfl[(U~ؐ!ȨEun*i SDl-Sз@W7ޘ +jםʝ+]0#B;2^7|eXR:OH mX$ n]l QKL! +S*ckcҋh9ا jN]N<ݰ OF'Ra X-.OY*D9ԣ#aj302HCE!k7%o (uB8ORJ"O$Ay,L xx&"cHNTAq,]E=yrj8[ܟ#Af8FCXeU4 XB'CKuLbNM2¡T q a-G*`އu6ljݩ7 jf6ebi:ZS-b ]\ngv4_,_anH]eQE_|=A;]sۘA1~ȵ͘eDe#DӴd[ʳkgǯEPҸ;I8I9Līz,y۵Dl-M6u _e;HX5Yȩesg8Fl2DVZm0|@&EhSMHE'Jrf +Đ(!dܴLcC(̊#D2DIG+YxW +.ExՍ"Us* Zԃ)@UX,gRp !ͰU֤%PT',}_'`D Gp}ڕlZ\'Qɰx5[I@{=srg\t[ivW͚qGC>Z)_©KeM"8=*v]lIZbnUiǢ@m+-~/ktjZQ{Ǖf@з^3K~,7->ggf~(B#[Q射[>)jARfvy({4rGJ\'"|[DyM;<}Kr<^C3"*If!.X6'6zӊrQbm/ɤ3r<NoA@*t,Q,)؀hy)XgtZ0eK%ej5VKǖ * Bp_(_ds)#e45G#*ק>Z1-3e15:Vۘ!Kfe$tX 7UB\wv;^KP %k~ÄW4d+.-"QkJA==&|)XPw }X_'`('޸/5>. U".y掎.O/W)y}%=pz-߽;Zh9 =f`q~ɖM9$\*}uC˭fdB IJsfBƎwG<~);@#$!%jyyù|a#@Ĩ1W|;6<ޔ +ҶF'פn&`ǃ1J"H镊?$p@>n.z"cB#hhKDR2uAA\c4~`qp# +X0>Z8&1h![y軗w/` X\ l[5H[7 G"ڤչYzT֤UӇG1)jf cd gՕUYlzMcW]-EVm^O0^"4.x^', %]/l0 nQL0GQta{.L{s++f<`N̪^g߽i }ku@8hIP@R؜ѷY6y}@͒ 8`4uP!8rKOq{ (YڝKr<("Oqؕg(eV] ̔^KtɎ)lբQd#RPC2sDQx *g؉𡽑Ī2jY[سW}q@f`duUp; -Z{fZ0"2{\BFQkNt$t[}{9"GXyklK{Zms?E_e5G \ FZ!fүΩ4J3gɴ=Gm״ +(lkRګyڑtm)]*j _مmSE綾ddW"հk0AQ% +ZPaWq:[V0)3{+XGR7`9b M;pGw~;W4e%:A].HdM?wo[l~&X4^q'mI~r4 @GDZm9ӴGeO*Jw7B~ՄF +xpxI6 +{+wcRi D8#kN|om6WlžpmtEXmo9_*T!-)R rv{Y{~3c{ߒ gfe{]TH+˥*av)iet*-R7:gSssܘAMoe$1f<^5Ѕ1ƺӋ?Eδ( V:wr^id<ɅX è~r94NXK3ҰίT8hL*"GP0 c =&2V"7K28X7ԢCs;1I)mYaDHdVY*HGW?y%zedBazQ?ƸEih8\Nt C÷98dޫTVr<0@H95V +E/9d\%}62UI .B6N5NxaOi}|?cON']^ɛl|9.J=3)S61TbFE\Sd2Ʌ <<,7">DKk౒@ePt+% רwL$^x Пy2ң?_pH*bF9ajXX$rBH-֘Rj~h(MSO{ !x b%Fs+maPX,Ȧ5g:M0]F|b{^@1 +X2q>r @TisN r,RD`b|Ak$ qFk//W4@V4-A-n§/PΉH \j0lt_'J0zOe~OAG KW>.R1H琍L+X Wf ІQ1XIAtiY90,>/$U Rs5 bSl[&8@PNN&%)\%=_jR?h*][psZ޸ *9,M#[IiA ݇rx@Ѳ^BH]BE.SviЭ A)[ אNc.Fghhz/PeL BIJT'UY%mۙ|E1Ory؆Zd.=X\6(21?"2sثK_H^D[~Ј"M _GPt,k?pK1ې@ R0ʓ'>^yoGGvF wL*ڼ{EID\PuuHeG]g4V5ZZ$q@" ) 톡5^m8JfEJM<;"%TGtسgWxS^ͦqyfm +ߣ;F0LQ0XVЏ@ǏYEQk@OV%g L 4g 뱗;-:.y9eD E5td'0j M`h܋DQ%^jPD[~eڝ{=E6 Ia@'ߟbW.ǂ6Md`D>)mwqU=QQgD|u3a0qĂ}pQ^iݙGbQw?ўCmWMݞ~ %4jB4{y?XmoHίCUE" +wؔ4i^t* UUUb/fz!\~3]H^P3<3WJB<$㰫-/I3Dc>**kִyo"i/m;H7n =,+hçӻmx kCw)V@ A %rgq># q{-] +(vd^90i3U/787|e*1J[TU id\]ew]u:T y[#2Q|bz 8T%ϗEmxDžR*6)m +]ϛ 0NԽ2W:f41FdKxa;!]hXP"BrN6r1@^~h?ݲ_jjϩ:F%_s{pe{ 'Yq  wAӏeKE{9o8ۏ|"WWFk6U$+WXms6_udWާU'4ZKM'<I)%H).NLb}ؗgeGp +7*0*T_/47|'51 ʗSH4C\F?#=K"p +Z2JFXDXʥ Ifh4l)T2[6ݭ<H +JL7,r)%2*۩e Fܕ3bl?\Yo\s͓+ +זXFEY \PEi lxIi]R [_ٳ.[9ÿ/Q?ߜo_S[\[3.;ll-[ x${M-JN =(g{װcEX^} I5bq,!`B?1|+!eZ|EOSe@l Y t\H**γܭ搤GleR+Qf:YC\&l{c yZ?ݼ8SBr^>W>|L_|{f1!ْj?kuD&{uA/B6mq" Ґ.͖mYEf ׻;;n5YWN'WM^kts{K]ӷvP0|X@a:XAηne Kڜ)<]8<հׁ& \}RT.&8҆_4p֗Z +Oڱ8E%'ub4Ҳ]wi=M ^ޒ& irVQhpϰ{2m;(W`T">Τx2A:,۳#/7r§ v8v^f~;vů&Ī 8.*{;Ȫ"Y-*o\ z]#50/Ξ˛YQwnєЁ/_Vn6}W }*Mq58dDD$R%(E3#Rv.nօg̜3dξznT)!3 .o%ٕΔrDi%[i!+sVeR;7"ßl|+\xe4 c- m,TvZ7_]Dڻ @*%_ܭWװAϕpHU~kG`(R!9zgU`Z-۪󭨔&q]kݙ&rPuh07Gό89GHK%tP]9~ A̚D. M[$iv""%&Ez}#^9ߍD2FhIA ,ZŘ.P}"E,pMFG1MWݯt.VpuW>t1Hlϵ"O%jʰ<]4P'iy*ji+HZ$sG<]mqJ.ݏ*ʘO)I"]IŸ lCIsdޫR]7܋ϭi쪥pHPvMUI5y摺uGQc u^x!×tLOT9Z5'OYI)E9L./.I`%^n'G4p^{3gIbU(ji㼩B1U r8z_2alVK&^*;3?K?18tìkkCao,Mk]f E"*u c^g+In}>e*h! ہ#"ߺY{0M3>!8맜FStE<$륿kt =Pk\p%nFB=>E/^Y`rl80 e-) QU{S0#D[}oXͧ,/Э;߳dKj\#p amsÐet_䂟|\+hGDZQ8Tn0}+VYMkYlh]Gcn*6YߵiR5!{ιE[AxvlDLH!KWJUcˮAiO[+^3cVtQ,*Z+U{3Q,ǝD'jPZihkw"R#f"6ְ'_3@/lEw^S)Vµf5I'K EYYPDm*RII73ڒփF)3գKApBh18 ;T:fKĚLrս cR@׀Yv< _1OxtNr6I􄹕5Cn&Xqךn~P>Ģ,mt4mH6gR|8]]}fpvQ;&qo(wqr$˨>ډ 9,OqNE.DPGVm4x&es*) +'/;0`9Eq;dQ;K\|~U_o6ק8nhkmr[Y&5;R-ِm& +!0.(lN +-+LTPRK *'ֆKYŴTPhH*YFTe +a*3xk@ +RNAeV*DERD~X&P :GZn6tkhBAXs[Ud*3Y/7d+P RIu/Oڋ1R~5 o/.z F);ә]]q&2k>\[/9* 5`&81q۶C*@1~GKb> +&l85jB5aXktF "E9:4Aߦh"Q_ ٘"Ia^I:Kima2fK[gbNߦ?g IFV!VQ{0n>3^色a%B)PaQjS{qMm7$֦crSQ(؝)xgՄ2VNu 91S˕Cg78r>y?.Qi?Mőf=5mr!{>=n< NcTձd ?g,W`=@`뷈õ33c400EP)?+k RwY39$?< HV'!!d{z"b''a[G ER(98SY>|.B(g͚Fdη/_U7]DiR \>⺈>Xި[Ѣod/<=e0Ë7ti;7 gsq8EQ\P 9D/ߝT]O0}ϯ&L{ ȀjX+ mؙ{ݤtDBsνOEPh/V:@ohg +Ll^g3](SxXfM`I*!鑚oEII:ZBiZUb", R@?LGg0'ϔ[H@(0'*e(M/ sa3.M*_x0Fl%vbܚ;.MZr݆ч"boa60~t) ;`H䒰*2[w3H]Kbf\F +60 x`lwKJv^s tZ+Kϖ *R%Ō +B ug`L/uMFi>$(hqr=*OG)Ll2>MG1i4>Rdt>UMRʼnbONBJ="G#0'R9.#G|h*ПS Sc)q,sqwS5]eußPC#}Xohg3gd~݊URhFJQՎZʝA78z}Er=5fO"1>Y_f˲}AŊC EnMk~hN0)k4jբG]U=NyeEJTKK{Z1 M?{Lx(vV?8ퟚ{G9NUQO0~ϯ8U<$at@hHirkؙ:ߝӔڄbw܏a*KL+'B٩VVP) +Nj22Ce1=vR^^VnT.I2}@MGȴqPvAџ$>lOaIK@+݊bV[XR*璏%HE '@09zmdr[ƮdM-dړ]XuM);UowJ%4FG]5(+LtXUṚ7m 7$:^p}VՇQԶm()Lf7ƀ$"dE1Sρݲ铭1KQyhDP;4~:j4ZK$sG%7exLxTOsUz)Q$(g2!~+CV$5wjgs xhѰ)IEuۤT?m]^$7dBAJ-Ʋ~Tݹ`>v{<`Q(:Tnl {@vJ$iB7`DEBU1=–RH`O'&wߒtQpeYnRr ,y?~ХKĚ ;bc>v䃻=Wg9g! saDg^ڦ ?@Oȓx SUnF}W  E,IXGBTa2 d.E3+RAj9s\fmBRIU _VVWQl+V~N9 }9*8DAXV>\G' +[9b1r:Aq)@',Ú!яtmFZšBZT ];,){Ɓ ˘Jc!-q붧rc_(Sq\;޻{PAkLp XTR{N9CD <K3nƹf]M<զ 'R6IoYUh-g+ iڃhU.VW7 ) {ۡ .tmH/ H6k4Rq:qs_(y +{[&,^&kQ IF1LJV~0pu r-sVޡҠZYP{ 7r~2+awJ +Ua +fՄ2 H~ġl" +dUɒqy͊V<7ei ھFNsECUp ;Ѥ P]ի?0wS'0~%\~<4v{Z>׫ZRJ ՠkEgӮ/`ݪ|Js`N7>Q>W\D?øU[EqRA޼c>0|ra/Īil=>lRYQd%j ##fEc^1(OfCfxh (w긶ޚa<!8wߝT]k@|ׯXLbXIH,!O,k;d-=KPJ igwfgn]Q#X! *g6gR6ڸKZM;"Ga Y,@рVhmXMvI}᥀ޞpS;0lv"<6EK 勉d~N{̽*Z֏F&VR7h u\cF~NmzoZOPۄh%'%q28O!ZeXaZ4^-##ZF6,J('si|5fr+3FޣQek-i<*PYׄ_R9UR֥GI CA_ +Co{!ao*cAπE[[)^{:9ϕ(eNmAV + sykiSX+阐BVjJZrQ;$Y;' b N@\\ JudwKG4$z2*sjĶst+ b9@g"],aGT=#p5ze`GXY +ߚ5 $)JvzBSKW#{,<% RTf _]vr.[vtODLA"j',H;yqsexߑY|EG̽lZrk' y=Ċ-qmX'@,zCjv NIM|7I3xHO&Ɋtzuv:$٣G~N YFpALw˳<|Z9Y\'yXPg4a%4VX?ZK$KG+\ߴ[rMv?R2J5q<$%B|܂BH%hH9F>3$VGlKf?ޡ,ûfO/{t!Tmk0_qAc۱6KfVݕ~*}ڒ'qb.QƲruQ{tVDH0 .r0NRhYb(v6\5p{-yBc +F:f =")lD,h5zEREKTGoC "\!V("DW~2m)Gh)hJbiѬ.hrD,PaTj'+d+Pt^lD>%{tR;3f +Yɟ0 4꾎&]=iZ9LtXUġ;u/g9) 6`O +0> m}RA/1&gH[Q֯+xVmkZ 5h9.E 1S$ dsΣ0]p7pU5`jHQT++r(~9nr5&< yr\PQU\h5L=*n\Si K~,ruJ0E~ +ޟٿJ^?qՁg$"s#ҍ5r.5UF6LnVc0:MeMc<8KUמKJF禢 tXPH/vhOLIv/ge꿀F Ivk{͖C w'n㑷| 1,a'}8E`r]|Tak0_qAc۱KfVݕ~*}vڒ&qӒb,+޻{Ojp4 +`s^!dRX%5>gS)0V|Xؔ)Ce `^ +8 uhX[°m 'Ra/1.{"cnEP~6\SW[`XelE\+ֺ AyVSE9vhӛxLM)j3D DI.N.oSnnEXtx9D{/ƀ2*OJ;Ĕb~䧞sK7'0H(V"rB]sFkdN2~K.ݏ.UYG\n:!#(П[˄2 Oך ˔|mxo/ΎT +A*Yh&okhE~~/x >T# RLr3;'׬gBQQP?.5F HwgfE@%m2{z:{D"owu; w `x3`\|~TQo0~W&`c;eiU*tU*x%6Mi6@4iHY[^Xx or) る +L?Z6+R$F*,O9[_tذe9=Y)D,d3:)Тu:*!#J!P$.}MJbm蹩)kzRpY\@SvxU@kRJI6#}H<%{ R&3YpL4c{@5;s]p&rԽ wCsR@0`f@mL{}QbpI17AɭCeĵakb+r\TKLjHO6z4 |(Ym~ޤp^_q^j_Di鴁0ȯQ|$˨>ʊ :dFvZ>s^䉪cB%QhQDqJ[dM5U*eäP=RWhńh㠮-;7CY(Gw^ ]Rd0+a4Lx3c^xH[]`U[?ke DIB4\A_(ĢΧ&ʹ"Imh!GuG6bD7n$nm #G) YFGҲbQLsnT(U$y-r(TťdJqP7UпSrIv?qnc +y?p}( +.?f<|/sQnH0::0[P7EhhlALfaziVѰTw?dHo-.ўcχ10%hI-й{;>K_?Tn@#5UiՄ&vaɐF9.V]Q Tfo7otVmpQ#p%-RlFոmPr^3cVsQ,*Z+U{3Q,ǝD5(44J;KPX֬RD_>fD a腭0+{*ŊB֬!DPctr(+ M%Z9)f"cS[zP(ez4c ?aN-=aBgXLtXւIѣ~,r77`^ +0PY۞a+ .IbxC&0Fcȭq~+rZMXҡMIQ +q/QKo .JxvW:mBO{'K@ZSb*X4qpidZb/8ɓeJR=Ѣnq5Dx4PK۴%d+5TTcRQKaϧ-B*ӶE97zX}>ODZXi){ڿ"\5974͜duz3O(,ٱ?ml%!EEc&W)mժ@!Y- +7L|lRd|bvJp% XN1e7^dQKp9 Tak0_qAc۱KfVݕ~*}vڒ'u;N3,HzOݻz[{dDHB* +[εjtJҠvk,dc`xJ̘2E`V;)=bNnU&AEZ!J#7r0*bDGp3>#]G:itF6i9Q,|(A*Z,w띑ւf+k/a+r쉇kN#}18 CWbJ[h|et&$K)Tн':?>Il|뺙pg`ѿF=07Ħjl%TbCZKq.(3TqUL MpkdMFA a&Nh-<@T*3Z;@,C|hۅ`M;:$}&|zQ _xa|%Fd|.q2N##'W@—ʰb*Qqഴ}r.SZ^SR)Z"Qȸ1"r0]8=\AVG#чӫX|O@%ݚlJ{XQ($S aG0 3u52];ЕBcײ| MZ0ܦ%[]6Tz11WpJ4h^{\lAi}t@0%`yIbݰrƯM*T@f \[)sEVU5H4l),yA[O*CkI4r TXLT\A_(2Jm&i/Z H6k4G0~M!|.>?-n<[Lo"|v=]L3zx=?NgC@RCa!(&~j1p4ur%cRޠcRɥZP{zčDŽ_\֙4?E߯5! vǐt j +aDT<. Olb`IS+JҲ4Y-ncV03ADX# +[(i9mDA,Q9;H}t6>9gL֏4-FZhY&9(@*:(=v4 1TW7FKQhRVoTQc!-quGeu'F.)S~;x{dNmo. (x+Lp XYR{wr]="T@/6@P)sa7M3@<sRv&*ZRW- i<QT k!/oBR\} 6t/ZH7 H6k&0Nzi>|>Ob8^tr:zp='}@Rue!(f0ptur!SZ^SR)ZQ{ 8&8T7_3 q:%u*yoMH!(Pq .Z*aD4<.3O P05 "in zjN"BPa;T*{ҧn#u'.6\'n.܏\2זWKw tX/YG w;+QxA +}$6 +VZfYU=ERZ4uנ,#PuQOVX=PhwYgy{2m!zui]+ھҧlB0ҏnx&7<<ܪ]p?Tn@}WPDpǤJB -H(ObfЈb'TW$dyg3 ^/LdhTReV=ieuI +V\)Ai1Y&,ഏ1,EBH/]- DW p<&]W42Z(1rQQ2wAd@ Bgx:Ò3>v#t+#-ڬaIDJN-r +O3aRrcdrkƮdIbMZ2vMKZ7jn-bo.0|t<PAe5:w̥PG7^r&^pAx)@R+0z <6YJ ?h|B[̍Zr[% y؀(U"55W7 9>mez5H/mר3`u0F}71 x:`~ jO3zpvOU,TTAL%;^?[: SY%2L?SR)Z"R{ =c.5j+:ǦSPPgПS5]R0hG@!ZX UoL`N +6`@aL}mʃ^bpI1עDɭ Wr &V)[גQnEq-ZCۦWz$}w\a QjTHf47ni1/[KV"eݤQ[SkdHbh  L Gqh,IY+Ď)wLL%rqlגKKFm|D$ l٣D~F0Q Z;*CŪCgBv"ޒՖw_O>Wh%Q[ ܳn4jDjӅJjRswCPT9>=ءxANK)E.5f O9oygoTao0_qUA|[ZRiɘirkbvit$@L޻wwMtVBJZ&FUnP2QQ%Y>rstGi0<0jGcaZ3(]%ѡZ龺AgVh5sѧOYX–(;|.L#%T,υ+*jO5LN-WN:ڔzF2O<%;RT͘J$c +pp;99@* 쀾D \rk!8y)a@ims]͙'f5#{_IV}cX^'t iD>ٴr >}^PZVIRŊbv0O'WTk%k#m؍ +m[dFQ*q+nc:?I{.nUjL2I"Aӟpm{!Q[uޢ ‡f;x,iC$י-c ysj<h}x2vFԓ ~+B:{ro=h H!L- +O.@cs@Ѭc'X"F%i7OT0R%!{]}m5<gQxV|uepwG"?n BBH~l]wtyd"Y GO7&apzOT]o@|XE]6DthRtjDDQH.-*" X +[\փnZXJɸC,i릓2P5c _(K~;y'Qw::}е؃/C.M%SwA$z.R@oa |{smND <Ѷ{5u6毉tU:GHK=^Ab5qDRU9f`hKz$}@m4$idcKV+LU2`yezeJO Wc@j'cY1Q,si|rs9Se#JRІ51hkZG$ Z0Ti5Kj#lunRX8=R8wg[-7օmט#v=jiU1Ϣ21;EiG(l $zs?>+^+B;ti>Xم|D%]" +vZݻ8\M&`Ө<0yx/%jrr,xBjVE_GLXkLw :`ZB9.>D?T]k0}Ach ݖ>پvڒ'q+NRFY :sjYy`@H0 .r0KвEe?X߳F=yIН,tb =B)E,NpzEREKT[ǵbXKFBD~f dDS8"p;\C#3d)Y\AXœjNdV<_@|N;2zKKZײnn=?>)]^׿p蒭AH}t@0%beUp&nr6m9) kLW)1չ7M3bH$y89#N5<*btr @,E|hѺk2M( ds5!| Y8YuqCp{̣$-Y4[m +"7C@RKbʭSvK[']a3<,G + +Uɵ-&)Gɍk*mGd Վ U׫S|Q(|ߝwS )uSn)3L # +.hI]yiuL"wVօUwCEn7@4ԬcUۈJv-Z{I[ҠHnx +8oc +` 9)d{ݓ(Vev,#:݃Z XIg{VuLUDKNsv+Eq gzvYHoNv5@Ӻoiw2AxϻUnF}W  E,(ITGBTa2 d.E+3+R1 ^r̙/M5p Y Z9!T9 ~MoeVɾRo)vG}Vbv0 ],^\ݢR##W1" Ĉ>|L9 8g@#݆lF-)2ɩERуaG0לjodqndE.%^t`1pj-WuK>S .OpI4lnw)st@0%`eUHRVwA zKp]6U hf"<6yЕ|$fx@w>T[ǫ=PbEX p}Ecqv"陴"7 ڄpCYc&/?%evw7pnч0 -`ݳaa HQ*| AH%3YOOVK'[a*2T^!;4~@*4ZK 3G)e׳xL{{ˡJ.] Ug%B + )~lN$Ȣ9s:}HfE3+j21OXmϖi_/ -uukP:Tٹb4IOk5(MML S7ή +(2EK*R87]xMR>N5B$^＞<6j`e> UH@Ua><Swu;xW>ƑF>H¨V[E{ttszmIV.8o޲}e$>oPMhͧ/+rwgE-޼6O%?H#qzLÞNFO'r +È)Ey$:Fh 1i9(wY ޚa4ap{;=ks7+`*$-wU{rdG؉je)qmZՈRs8dm~moQ;[S3@4F7{~#W2|U%*[-Du̗jtJci*әr*|NI>n"jTYÓWCW) qb]n*xd"Yizr"IקG/^9gY۬2Y)n⃘d6˰d)&Db.b="[\U"]EyS+LɀU׻|#bZHO& +`>ɝXؔ.ҏt]z%)Ֆm@K-PWD>!jw{{;II^,T~=>y9U_W˴,ak0Ɨw"YVp]&84QDm#Zv&3h +E]-9H;:۷ǧG/ON^_߰_ J? `ሦ3H-ru:ZlE*MZrXuVԖ :JMa? (N|I5/ܓ}R 5!D+MA4Zu\\A/D0 MOņV(N2Sk,m)KUt$ eˌpX'Erx|.!BV{M^;m?x<а`;l[Eo{\bY.5)~(%_m#qd7KHE2ǿN?,lMCS4: pWWINW3Z93f_QS,!ggjgOY%PQXW fGǧB|SFCu Y! +A";r8ҏl6חiVN5*=LJD8OPPI h+XA>W5"(Jj9DTL T...\}Ahiw,3JU T +{5@I! Йuݠ YvN/`RO*FA]a!CBKW&6b/EP}p;z@6t@s*WhA-~a4ޥdB!+v(_nzv'.tllKq<$\B,V3t$et$̈:D +ʟ`LLmQ NҪ==琡Bx|y rr_Zҿ41m{mZ:?*3ȁB +,#K:Y/x@;Xx_)ͦb +rM|b\/.H^i5`XEgq@~ICC0T@ߟ5 dQM 54EV ƙ޸Nrex̋ 03@gHU,$_KfjrGP&h%dRfWD@SDnuj6+=E~}s j_HM +'H@;ۋu|)Π:\N,ӕi V- +B^VwAþY@;.)Ň#*;d*xC;qtւ`2t%ONrQEC_ٹ9Cwڝ^vBJ:sD2] )ě,8UgdZٝ}D.rKFwf ^벦]\V8G53+}3A5ڥc@KOgژX XjܟR@wdp j#_ 1,+2*Zy^;zxXb8-=0S3ik~FU'נMpqlp&fDtxGXUL6+z(>}1a-g|&ԑ~ףh7q.h=1{LmMp?_4 ڹK^$1~s8šbP\YwTᵫ(cy7[[94eU=>9uV*gO  +,u=,~jZK'clH+lQJ4̠uxjx ,wrFa9[?=>Oѯf݀*~P}A%V*-Kkܔpwg7rgɀ&8}gx߫a.^_.а?+LK):H}b$oGGKTH`pkz@20~(xІZa>@H4𽲱aIã?k][c2]ΝH-BtuwEhMσq W韶^B$Ct(ͻٸ^ {Kp:[` e\L*-uTڻ+R gwb^`ݤŝ`#Dzo]e6s{e/%1H8e:GM\ۙc\Qk_-fI@-/k +8ܬB#;|8ed )v+`hUOERcm67'))B0[lg3ҶogZ[st}'u<[djT!A+X{iL7 K,v? fӵ|KCOvʓ'Q9ZKDAGsuݟqw@1w=D̫&&qLMuCX7 B3XceM͘&۴w +0q^0 .޻(lƆ㩰p I PNULWdv:R0?[yĚ4H`V9w:P YHO;Skv~NVX[WGZؙTB=9ф4'%o*:褔| 1 }7\{IMnVoYmPpfR7TϨ5FNipɷME v4G7eta(*&Kr+P,+jJ-gvDT&g$o>,Y `m+Xjдi²mQoSn2Gna;.N^۳>Kr?-I~0rŵRwNJA8>9o>4Q,H>̆:j:8jS4d9|-VKrP+̣1ߤ(ڜrȝltt[Tڶڶ25m@~]p*)T~ +Z9(ܐv :͠=v G}XSOR2C[loI0ml=쬿9MY:=72n/A%Zt̅|ƂSF7l9~i^.tsj KTT<*JCGpdYSrrgY+g`T4Uq%#ydֲu8HdŮ!blTqB,_DwOIU=<}}ґ9U@ ڣZ6HbBogêA> *k8~= ZGR J휂_PYf ƒiENos<*Ne$*-NnJ#D6Cy*D|l;rji_~71$KucrY֙51gq?HF3Աn̴褏pSq{'E&MejꂫgU}Cv([v\B+)iR^jbREVA:XW.>&1xoDrq_,|??"u}Tm{j%yU]Gd +o z*hG Лo%feo4mh82DEStvgr"Urp3#LwÀ*cΘF8u|쐋2ePClYv `q R0`NcW}Ǚ-RT@PavIJbt۞) t3 ͱjgp*𳯈3DV0ӡtȣ؞\vE%g#YFJQIp? "RWk̇2MdwHZt 啷8aJJLo%Ε%dGJ>8BVӧSR^'bQ3SV5w gԽ^&w**uN]")s̩1R\TyU Y% %1[?Yg(G6TC&+G*2ᑝ0|v@'72dWѹM9]Rh/aaVkјF'IVV2zz7okX98#Fd\h"[d n7Pp$Βjm Xh+0FwѿoV]C#/u7zZEAzZ3OTCz?9=s26aGvTƘ v=+;࡛$["7:+8zq L|/G~/"Ei*KHHk On;212{> +&Ecաmzp:] l>`^Tx n7Z=5$~]BԈe{k"B~!=hrGZ~G:YT\dzLGwMNvI?L3l1ɶ +ޠ s\.:#9L _g1Pfv9ꣷcr F O6Eqõivl<;"=s*pӖ8[U.Ѭӫk_j_9[5nz*`>e3 TqI*O ,Y]WhǜG}45a`235ߏC?&0Q x2sJȱ%6j4m ȠfGnohYvK'یEyU"Dgp<z/{~8,8zLkXu +)'u["VcQ;_ն6җ-qaܚ%^veƾhwѻcjL%'z6|ʖڼ < +E%Qx a暹ÿg1VSr՜ϣIAMl $1O E !U_S}p '2@CϏZh \9•_4 +9{:{@G\.i\AĠ\XoF**QL y|"_f!d0v[=6}1DfVOo.^ ci0~v"Ys`9>EzN㛤^GޯzmsX:oEXδ7>BؘI{.ūa# 2zw@?6v<XW.cs6곝 -,mAQ0#1,n?[řqY +lnfEh֊l1Pe™ȥt#X<$A/ <9o +HO1BTOA2uLYYF.H{TmIhAD,il=I@'5&Z5BĚb_*R0j1+ HxkTڇZ9woh]! _d) 쬃ITU9ΫW=Skt8QKRfH-A25u8T*.x5j->΁Ƒ0iᨓvN3y+ePԛC橥 M|'(y3MǦ39 C'za:_߾P|2C+t+o "`u`D/cRz")k3ebor +ӷ;[K?;1)簘â?2֑e)NȴW v\(֌RƳo԰6.'Xkb2I6E *_ LdP f/]k*IVNM$,E7n财YߔL/5͌$v`*d +UF<+53z-L6v$V+HND`ЩD} r 6-|L>66ofi Km3 dMAC}^`^Ue؀S J awb,uC:܊u5xؼW#-[i.D8Oơ.4f5EIUu?8Rapzh9 -IxME U0۟~)V.vu\;˾L $w:/6hNBXx55=`Nmyx{yKI/?ARC2ob'X `ξz F?o Aօ{ɠZt{Qp1:mHnej =녺$>5_44}t|ک]G[4j"t٩ikfB".:r|ߦ|H mg3@='/įCw^Fcj8,wRf6`3_T^py NU N{Ocr][R6ʗ*EL{+tZwWaU8ym(uRZ%zX s\ݒ`W&[;M?!ٚk 5,$L&a]?9.l1_j;bx5Arۘ*55x(Ac3xΉDfPGyɜxSlW<:j<|مa P,hL.p}k G.reZH(޺Hco>ށ&& +īX>W)+sJY)?*!5>#7^YIJޒsԁ D*OQ1l5 +WGhByd8^}kLNTpyۅi(Q5.5bee+Jчnl㙐uda͋JB v^w%4\O֠JkՓ3yj X9 9+2tW,+=y՞>r$e|98 Of/tc5KLb)%C~hBж\!244^g*f{hMo-2=vѦ^S%ɥ& Cmvq=A#x,ҾHE&yHe+5p=SPu@9lQEUG]/߇/?wАCHh +VW-'~zb3иZTpNۏr2mgIu&ĺħijԀA:m?ܩ'2\4ҧmoi9=#<ǣI EfI}-?(>~!1ć, n;!lFXFZ,Y]˘W:;tJg%GnH)^pi2 P4~UomI|cSbnZNH~g|%O]_b.rha(]4qgl8x9N\ 5L[N:^ 57MAD`%RKQ.2-ڱ&ǚBe\ɲ)H<7[o8RZiSIyYmo"Gί ++r]6&J jEV34azvǘ߯_lKIdcfze۟EzՀWp-bL4H_{(~6ϗ<L*ί"SSHeeL2Vt}g N2졙/"y9:#΍x +f)OzJ+ MT,q3>gٔd|AH12(keB v`w4D!Z(@JMwyh/!W1Fwѱe DFE=} % ,I~Zj0pGf+";]FoI̕B"C'k`)z e$Xex2o$T]C5#s4`{W#7f?L 2y-.O*员K9sHyR)c)!"ZlJ.{2ji,el4.S]#ټ5|!C<4&bJT |1! Dhdu: * 7  JSl"s] "4pe@-x{֑VL O0ǡg A`MOB͖\{D?H9u>2q=87`3GVO-mLSthSJbȫ "ZP[sF$i/.|6_i&z;K0^0/ʹ䨿ŪΕFKnS[X^ΌdsZ S>X&s#*w0r%I#5iM[JTK !Xk bf> Til#^XWec3Φ' m22I6VٖU##alo:O\muIڠsMˡ+h8^%~pd[+]i,4%-{V5Mw$yf Ww`@iK&)5Ғ=004aOܦ9̘K-9Z촳9TgHc=dbumDYMHE3Hw` +yt5pQ+k:e(m*|Kf]z|E5b_!<`_(?78fR۲3n + טn\+{=K603reZ 7*ט-58e%p} *;4 dꔑ#3eRxTeCdyCʙȸγ[j> +fy&EC ܫ4 qiޑVFZ*r ӫ6im׭Bނ k97"]̓[fa^zɕ雈L)WyrSmq$q'̱M"bbaMacj5~S-n䋌jM\y)$ Z#7!O^ +49@LYv0b,*}Gv 4elT=$R3 nɅI ̼^q306AˋsXZwQ:@ +sVГd_ɁAJPU<1e>|1mPZ[F55|OYmo6_tcu!vVEQ-sIx["˖Zl-swϑ/y?}"OO0 .b挰?S)L@% aIp)HR{ oxĄf112*F.d.bj:L)JKER9~HFBŘ5#d̘U? O Fk'a פ@ciJT,*ƀ#-OB0<{ e|Nq0 .eCD_A]ҁ(wGϭ.䚭v̀"K9ѕ6w^b9.#Ԡ4#dnLvEѣTI?Ȏ s-R5{`<]W)-06QB"颴EPM +"^]Q`L6y=]v8zB|L.l8^ޡOY0 LLa)GDY\VϓXgX^l0#f٫eP w.8OGP=ݔMBs).HhGe fda5 0ٹ(vEt,g/\@gԕx=0hb3؞i;ʔ4aU[-S #զ+>N_ChN~ſ`拶8J|,{ÚqAyMT1zsy|="_oT 7(]R+ ^+?rapf6O[lխA 9B|Uc9t@[b!bǗWgWgu]b0͟2Rz^=ޝfpiPqz[sr-sp] +j43w؍ !( ++;A`[{=oq|63i?x3+5 +O+$Y ]h +; +.ϸu2)%fh7/hѨ"jF,ox|/Vjk?|Q )f!_>|ojOnZSiOMܽo|Zs6q+)գ}qb9nb7N@$B:ow $;1Hb]9[/G/ vFI0K?wIH\,_H!V"NՀDfrAv? lt cBŶ@f! cx"Ap  ˔%[P-5*K+҄-[!Ɍ*1z *|:0'V5^')˔ȩ3{ ) Qf7C$2Nd^x?c4] vIA"CgB9H(oJ5H)- -9H`x:AqrYA05jո~8_{׫O7&Řܲw7&W7pwίÙ~cLkJ!ZT +de@o1"aŋ/[$!i\ +V3pUS)Z`OHID4xp|1+_]~H$TI򩡍v%sp'*GXTUTXdER)3D6W<py2V 'S!<`+ .el +Db[fã+peia"'i޸?+^/fڿo7\ wCklÎC|L\b[tX"܈ذT]sWeh_nJ,hQ>~D" N|֥ڂxclSg|X1YP+$ thVYP¥eM0DLf6dOj$Z7wZdP>"d %WDaDQ-IqRM +07DctT~=oI$Z&2F J=oKo0jc31%\1M'WCGmGS{y8Z6dA οâ L&[B$DEѡ30BBrGJY H;20NS4MXTh%7Me3M֣FjT买;2DS@]g|.$#\'ڗ waUK tYPl(K)R&b\d!(wf@W"j73o$4AxxaD['+ tf/R>͍IO_S]{w(:3!^Pwxů#o]f +E= ,KNR@hPH:3`$2)9x?ds-!]`cn(H5/~a"X@ɦ8zpDt` !)iL-! hPL#?8\4aLX#|>`ŏUPaP1(5mWНALȎGrZDpڄy:> +O9zС@ǎ>k.7NSKȐͯxkxT@U_T+]\.2,Gp֟wj9l A TL=N 7UJq_zd +VcIy^9)GbK]i*΍ij}]W;¹Ob -xAc y75jUcÅ Sa] +tHON&9 *5"k +fTzky:}VTw=͸g7$'Yݪ̸&kQ9ؑ:Cw"GnIV6ƣv8D%/O\ &)BЀǸ%86j7 v[ +ZRuW쪇_'|ЦntR +xb!T*QΤeSR`l$ڪvKٖ~d]`oonj W:ty ٿ,<{gJaǰdCCGި&u|%'t*8h?YGpҭ a΢i;jz OX*-))6{zgaS}V(7򅨯^XJŊ"GLĦ%Jǯl yvda:yG(OkysanӽM +lk KF*S +T.*p[%d?)L}Nq|q])m~FT&V\\{})Fs'#V?L +αX/x.Ի˭@s2^:㊰Б[}k2Y}[ZS/lXLUm9 !f ?EC?U)hﾃ4 +s@gW(wgRN͙ÛCЅWmwuړu &g:^^ظBL/glטlO̦{ ;mjbFGks6vF~T$n\5ב3NP"$L:KowH;m#7v`Zϟ]r6ͳ2J$rM<236M#!0!~J<_7h8 V2&(Q[i@kQz+>MfU4laŋe"P-Py8%&8oĢI^`ae @0VU2h +G?6R~cE2]i 0 é88'R*YKYaXҰ@3iђ+GhA1AR$U)-$Id#h*ɻk'z*r0rs\(fh3ȋR:\{ڗ P`vpX$ͳy`%`52%{VnVEKVZ𾶦w|Ui5^z|>>U"`z.P'h|uh;O3ŕbb jCo](s i4cDpQ]6yĀg#Ezhjz,)ixJnRѐ@ Ývs^-d Ad^lZpd"x)]K&[i4 x$e%J76[k^UQeA%GLwLӊlJqJv '﨏w`{)"dɲ/;j~g1%X [Dj<^@m0F$&lԤ&h%yI艊[ zQEW2LDK+kPf5-,M"ɦ+q}ktW{iqD>er6vF&MC- TXT OԿ2 r{!<=U0Zb`o lRTtdF[.RWDbUXcM{ѱl,Ks<;R,ey{-*UE A8']'哬!}HVU +ȩۤ jTUq ^Y@I7MwvmzP-I,־ںe>;mX{cwJsIj̛VNu|e.hzz 5Q:$_xrocm^NsdOA‚4E3y0""NH@H]$Z#\D:ڈmڷ+V}ZDkt ~q + >A1"Ea͠V`;ZG~$}].|vX +h B8nOg!9D ڴ.CyY[Od" ,P"H|;2P+kltt=0gfS魣rS{30T\J2z'qP|׎'8\f` : DBw30|T 9^Ք|5w-C7H +z34%^ vdvH kNd X7 lfZF~^MVM ;ڹH]pǪ`(yA"WԂoDצ`U9#ņT w8xR誰T!Pfggf7}e o'&y&Ev#q `?VɅI ^VEn$4K:˜41^ئqV(џ@H^8 wpMm_/hG +zV.D0ԪS =}K[ T)[4fy'cmVѬ8GxZKbvYQ &C&m[,ߺ +>СZYX΄ +s}Hcu$t"!\tf[WQRN;qsԺͳ2_-^['uNSkT|P:uAxouMW3lK/%TVMVJK^Wwi&mg6-)?z?DPs Q|\\x=J6UK?m㼤 n(j'%>4r%8,]}ۀ}075NA_f2Eb +=)nvڀ#DU|6ɣ|31§t0Hw.{i~m WIsx3 PŇ,o|(Bdꪜ1y;hg lLܵW硲@ K3Q\q<*jlRNeӔ3>[xp6C 9~9 hf`P>p'67&Vnwk$:.u^ߍiVSzV%(?DV'?Gdv73hWnF}WL Y*NF2`) +ewb&ޙ]ީk(a[wng ۋx_ >p/B 0+JFZ|jX3口81s + T' #}0jbT.M{ #d+'mʅ"!,Pyd`ʹ5?y_&}_h¬PFhHK4|_kB {2* 4JDfez-b$RA%s4D] j"i Ѽcb`8,v1ˌrYfH~Vφ4M<*1뼉B5fD(b ,ƨF۞ŊĬV>9<^abmS9ik#yTX Fbs89Q\s *dV 6<]e;L>i6t$M$6Q f~sEɔ<@n5<*A,`KЍ- knY1=cº؄*妊a6#)J}E#"MHX1֨ض@@_`]a5i6'v.dh.B_cIɼ-LjQtvy5U"'z+E32FcXhV2 Vf#}he`$ 8G9 iZ%i C~'",ȳ6YXtבrO=kč ppЭ&)–,n^__Q駟c,i߫f"Sn/z1V&^ TAvvkRvc_ω]ݜIU2{ukU7ijp3 ?l-,V-R>eIʝVW^Ԡlb*t'J\݈łr\ǨAJdג&M\>; RYJ`As*AB<,lrGiG3IE9籿N6*ZcR9ę7mFv=?L=tL*@jJ}i":fmޝ1_T=@HqO̴Uzz +MnHmX߳@,n z5>}oi|)^lR?1Gqxdw0qÆ)px/E_0Lʝ`*5ݳa\IO\1Oϲf·/笟*7ovB8k;DDŰHjɫq[:e+ܶo-_ɋWMo6W =$ *zmq]@$ӂ2kTIʊw{5R87oҿ~ y~VVNH%Un+.ZB C)(> J5+pk ' h ڴ(ڌ rXrv0G駳V3i8H5BVJdEAEp\Lu32_;ЍBcײ\6m-պu(Wu cKe3: =KR%`eUHR _B䖁^pkI4Hx#m$|&ftWZKlSKC/w *B%a-D !U>hEoӞJ/ ڄx1OCx,/q|w7.&7slz=YLfSz G5^2 +*ERɌbSj }r%S*OrE=Q)Zݺ|T-΢5]Ր~'L0V*ܴ3Ok&ܴHOkMB Wt<~ UaoFίED^;5HT-lcﺻ8vw"yof]=JGtNWdJ Jm + +;&#ے/*mqJ`i* b%ZlFWjOjUKk=HfJ8T^B_h]~Vk񱛔$QM{g_B@&`1(ŁB T(^_e%a|ynjaV)9 [fTm0p&lV_Ōz~O苈:ҶޤJ,lo_k0oon"滗+郻 ȦOv qJ?Wt7h)"7h$?gL@l17&;>ҝ}YfCGEkma6FeagplP+}opdEˮ=؞17W)^ +1de:aԩU{?pK)/M.A+M [} .ñJ]7e\cJDv={(;g=,J sy. <:m $rhC o<" (k4oYmo6_q( +4.\{6flH]O-2QHʮ7HJFZ=w Uu6~ µ*%dF{whgJ9Ue +o,(]LP42T"?3[a%\Z+|2~$V-j2Q ++ZjF3)Y| ,79U~g`D+2-J ,T;E/JUhoN̮'ѕ1C?~s<@BG,;CdLV"uU*356㇨,(} 01?Ջxݎ[?077tyKFZYbBTX Rl)(&Z.$ ij 69z4t~̦!}7o'7ܾW7 ~}zzCʒ^;|J-1OZ E- + HQIVRdX+Ϥr$zǷT%?c?XYscJy2 dtx̯R!c'_I{Kaa0ʚ#0`FQX ,͖x|t\^5x/<}>Ʌ[ǥAZՓ{!䲒G^t1s%rIbj{~:Ɛc"~jc=>=}}٦qEVЏZ!u2YDd nWAcb82nbꓺDyPy'/!u0{RZG[ NkCVPhQLh2ipߴ)5u +c6E! "Wќ/ͯd;pP`iiS52hP~Gr4,NޓG+1Qܧ7qTWL!Hk[#>C&^1ؑǼCfxc)p0 v-8W ύHSu 1s7byn1I|¸/w|銍PMcC<\kX>lU3jL2r|<|xrFݩ +}q!q:w}{j>i~׉!5v;ܙgAiqѵ?ԧLi +7Ȝh'Emzwř`,Lv52::2?޵xa˜ iSue9l~os NSsRƝ[w'14V5AwIl~) 9S)G.mT]䭽,qADSGZ bxE!0R6ʝ /TMo8W =mIkۢGZID$%)nJ]-|4fVE(B*j ~)nrL޿,h+QR9,P9,됙Qп\W~a{ER++Z +9*vڎܢ+-bʻ%@ʯ7*tco(F:}JZ~NX [2BuA +k~["7mA3֓ xO0N^_N@iSuOp XgZ)T'vTDxt yxo^&0 K/H1yKʮ:S-:Gj}%wPbGX[1à`IqU/8E$ZHH6ftWwg>d6!}xH>nw6۬ +G7[-I2je^V3?E iN`!+Y=UFm GdIr%oHG.5mV6dONIAN+l1{< ť2HxǕwlВG{q"Tѣl|4H=^ybL0NXغo@2DQ{~n6gpg' HdgѴʓr#4.~n>5e}q0nyPQEiSL otAor$u} ~Í"\gq.%VRH,gjt8cpJ:LFVB#;$f*)n_[э'"|GӘ^GX'bWqr詗ǘ9 -޹VnAV0 h6# QvAB AW4Z3>V=Zm`GDK>ZD>T 9b@ +˚KYJخp,i=覗r7cT%1m`Шw49J@iO֎.PGgr@x)w@8Fw~m΅'<צGrv,^sJHCo jb-q-E !U1cBpڦg$t&|FQq2wQ'3&Z"֫8+z[Bgxu=$(| iidkNf$O( +H[kdN E0%dG+պ>)a((0߇))T2 &O SDZJAVuC?- _.|rr{sig-(o +t]a8v-ǕRW04ƣ;䘣:oJЯuQ +tf<9 ApqTQk0~8.{\ڬmYIXž8Jr]oN( 8ݧNΚ]%I +! *G~~m:ե.oE% qJ s-sT pCӒAVQ*Ah@h@+lB0rDikTN2DXӋ+y/NH 6%(QD0uYN;ykǒ^#C1NX[Q'x|kуZtGtXTRg^ pAx)a gsy$]M'<զL*Ȯs*JC5 b qD m0qE IqMų ,O,N.]^ެnZ* +.t.63@*ύa^(G~ +-Clʜ䩲%B!irk-,tTSPx|$U0ٿLHI&? 3LL$ +=O a%<2y%uk՗D/+.|v +{GD3o+t.;ZGshjVβe7ޝM%r,Q1|{4ػ"V}(@ɶ +s2t ΍m<įM!CUo]n3<FcVn8}W <$cu]`-"r["%Z&"ZD[Hd3g m*@̹s?'W7,٧vvg0JX+Bk 5ϘN0t"[YPڬDJ|ڱnT٤uCF>#J+8d6٥^ He4|S pغnkc /sZfɚV>sJgO1zN m>ʜl] +/6 +DbYEtr@Fe#kE[-i"{icF8I»q<{y2cqww|rf|2[O埓u8RS) D*Qc 4u2OR$Jq#גRpƸ6`2Eyu2dw~ WMC͕ʝQJ1TrgY-^й$UZS#$LQ.?1 ݎwGҚWΨ +ٲ' 5_Eٶw~@'uwzۗ{/' +jVMIdL>ɛ9iÇ:vlsZ7OϚ{"'9'E aIC<B%+s'ZC:!.7ސ4YzdSe-؆#"qXm$I7uL\{>C6k)}o5`͒5J0VYh%zVi'8 XA:ɹ|mHr%+_礥_AXcBp UHpfx|m[a2tcoIjQأ Ց6 ]k+tk'sWmo6_q0RR۾%uZI0cnb+ZdT)Jrd;݊}(0"swg* ;p W"0, +^L˄ʳBDƳA´$ 4H+8Y̚)WBFϯ\8IKTκi+S=snOgKevrZR}U0d% 2ZGHP񘩐 dQ"^+9[P(+vYu#2F%'Q?@PϬt6Ivw y"XX2T"9`6Q0C2&?YRC";_>F̛,Z#ZB!  +}Mؚ2he ^"'$= iA.b90wx>ٛ~=.&sd1M +$dzq!CS.Wz*Q6} y9D$ / s-W4rR-HTK*M|x+Y$!8[H4ա߲D`pnm7-O9M&/G#X9>(&B[9VZǖgFd|]qW.@7܌q"c"%SՉ"bm +3UG!$@qр-B򢜅77^Q5+i$N +^!vL:GJɵ+_)Jcv~MpXPC0P~ >=I?hpU +#%h )쟼63Ruϑjt;G%``"l^>b" londlV:G>짎8t]p[MC#^'`%% Բg4ۏՇzH;LS8,Y`dkcW]8W ׯ5c"[VpJ^xɻ6 |W񴙲/w -cj9SՊj(j?t*k ,[W{kس͔k{j#P[q: }4Xyl(-o\{-0 b XlǩCn? mBQzջ\|Rtwn__Z_Hg;oo;t_j= R0qB~׈ _&ֶG̅L} R j/;WmoH_1WU4BRPZ]t(9BE{f^Wg b{}y}:fq F"PZT'2ڙTs徟y¹j;Id ްR' υpcr Rzgp|m,̌-<[5=H +LjZ)|?^]%XB+?E`n-LДcEE +JBV&ƔidUԃkiTeoH nB00b d] uu q3mT:;Wk<^0H1T̩(F1Xq4IiY"*eܣxtM0O;azp>@46AbЕ,%*Wb }rDENrHH̝<31c<ʑVnaJ.ܷd1)k\ޕHi?A0Ooc8d1gr˘j#_ 6yJÔ3_jֹ`H(.f,1|햩u[5Xm@Py82S~NɴsJOmѥ$(J U{lg dyy B 4] qb T3?ODSaExX8 8'걜<&K"4e˥Ո6#yϭr3?7ҘV`@.ö]+oy`-p|]Vt/8KFi\ קk,BD|i 3L6PŎ7H`sG0BҨ0ť8:B8kg bQ'L˸!!4s%*IVÝQF~jͼ*e{m;NpRw"+ +=!̓0'tUcdGt1~d@~חOϻ}~*j4k2$P,[V\|] hqٲ^`0( ʕZLEwRK%?HQKsuC1p%Ow,yqd!cU /^ɓY;̻vgwV GQwd}k(">$I3#_?UV4{v Gvj\SHd\cH2`5b T.G4D)?6 +R8m<7[@,5d/x1\ ,JBbhٕ>0υ93 b4i\`y2 \xrA;qGDOcS5d9U4Fx<둶rMP-4"^@ؘQdI^LF|]9pN޿?_&pNǯG1~3i9GN)RArO.ꖢN*ų8Ol$ׁl7T$}S\o z)pa 5Y.AAr,O(PfH6xZ)="@f]bwi 8 ֌{L^̛;^13l҈Z]{3 l&[|~O,KGW[ ݔA(Yuk "2uZ?t=jGWsйӿH7bڸ^/ /=o?׶/$/o6sۺm^Umo6_q08 \kݧӸi"r[I&,IEI/uDEXKLλcA?wAҶ27fXSmJUāb*;KnA_ WTXMR$%km]EXoDߦ]Do@ecGqӤo4|ގgM[N&0}MgoT2JEmE1S`IטDO + +yGZ1`"#yT8Qiz-L{mCutWR☑ ;+]Am7VbZ6i*HjRQ;fSn7S7f hbx> J<.ZI*ـo޼ño1P' gsB@{\oUE 01 J˩j#`JYat _S88{s>IZi.je7B#\2Bo2}E *GV2}Z.KK/RD3̭bV6x;J`#H?\8Z szDPc"tGj-MڬeA\2$cjݪ*Quޑ#.c6Vg-Bip6RXVR䑳cP*'jJjnaٚgf +PdJ&dgGtyh 0^nAU$k*6A(Gb < $hiZHJon ؄Qw2 /&|溜_.z2[L/pu /fՌ]d-^ 2 +"(SɈbSȁRɕ<)En< +ԙ4ƍcG&#aVmaJܟU5X Rgbh$ ]$[ +m{%S̨R;N:A^C|;DvJf< <⼍V=xk=Sc!`w";TM^b D$vnD[R]pbjsLwHi6 "ho 1* #N}x?.^٫(H|<&;iZ|t8# ?V%qSSG-Ja[ {VPѲ&H[*@ڀ1X#[(64:(Ѡ!(OW2Ixg8ܮ8Xh@MՖPpJ?s4=Z<<[Za<߾1KR~jĿ?i+S^#~Q:=k}nn ox,j|sϷ}kr&YN+T*U%6ǯ_ .GUw6V;hGhKiB{wN:gwUmo6_q0ecۤq3VC(!LD"5ﻣD[Ӣ%(;y[(>9ejTRV_z&N.UN'H aLQYi7DJD/]# µU&1+ +[(i}(ڈ rXrv |ryKBh[hsK +%LrjQT@`.LŦZF+YQ9\0 Rk]w' +%>Ȁ.vP[F|HrU!JwW&a n_ +e coX9WiFiǡ1;MN t +8^AT* Z;@(C|6ߦ-i"7 ڄ`$q2Iy2cq77|r.gd6kO矓! QF2\!(f== OT.eJ婼9BɨДZ?Be$R:/*ˮ{) 8T7Ss qq)%?'JWp|EMd"[ .P?pLrq2bZ{Э~€w(aDX ?̓x&s-7]w`+ X5E"0AQuf>_̴!(ǤK:|)7U..!2ZcDU.ظڀрPm jH@L'fZsPAT:g`wkh/FH8M]p%~J/Zbdf(uuWhy|Eb!r(g AQ:ЊDAܑ 6Y,7h>a3{􆽻>~B q׿iGPKr-(w3dmh1͹#&A/f/|RgŜ˙",p1S0eO^aRb ae |TMٶ}?tF^nޏk?y‚96ܯ2 vn`M6^G{jRf^3e9 +Xx$\s6jy])FOp9y%&'PIɡ6G='|3' &jﱩd {2,xǾ+;gMv{J;!ku: ]C|ewQ9|I]Ysbt` mPbiX%ET̪1$//'inJҘJY,A!JTDRm%ĽxbVR?1:0dJS&=-D<F%%A<3pyy 7h ZЯgA޿j>5ZS[..f8SV'GD\FUSR"#YceM3շEƚ2՛) cR1:XZ:[gCx[m͎zLg=^`ݮWCt5P͹IֿKV[ÈsoO/Z<~&C)MQ@Dgi4ҍqF,s8_f FsD{! +3\CΖF)b9:Ǵ-m2-_a+ƯZ?@BsuV߻3f^@5DAtpBZOEyzS1)2;KYX~AQ~ppekh戃7!w9$]rMۖs`{2..k@vado_l?D۱w|$hnׯ ++v bn(!ȌE$f\,م֕Oh +y^{}W -\B (}O}m@Q ö[[gE9餷ݿ~C/ȻpǓT \{s7_djLʱJbőu$ĵ\$g= fDs}x 0/Ҋs[Ww9@w?4@}z>]F`aYcA @MOΖ \3J3"6N6߲6`o&yޜ~}~=e7ً&W7_g P.$PbEIEͣ, +lމa-U$Ѵ{JL<uGR:&iӌwSc޿w@l]~H$dZdS/0IKXU‚e)żYǤ5uE3z?E6@PX.>&Ih#vT#SY4 6|Ԟ'kV0/'Ld +ddmܘIE߆Lo1{ +R>D#v`0<1TnEN$TFŝٓ#CƜ¨M"uk@dAr D9=;bg<7 e}YFhxnk0 +*ȄsD @u}7*yP0*ۯJ@_m}7OVVW FRaªXPDɳ pA.vg(ZrZ #  +F1HO4n&+1qB+2ObyN~qy|~2eiEVEJ6Y;J$g?㙮Kg胘 =Q`z.BÒRGdS(%Ԕ6olzM{J`U3_QUD)ꛎr)8jZ[%)X:蹊UUC #>&ͥ Z&w`,lp6UKXY51hA}zƞi ܯ'+㭈tw?d<^q_9-O*Qb.5=ٜLMmhsufgm΀<>k|/w]A-'kfQ_-5 tP0- +q:RrauSZ^Ԟ6Qn{|'tmqHϰJ+!۾[Kgو嬥Մv$WS>ctff!8ۚB%vխ01ne) %R Ns:l4:\!iv\ rjvu&j&Q \pI"4:cILF3pB9#4ќ `4XqˊW!Vzs(ܗEg4 +߃D oQ[̃QUa_ձx&U- gN{ZIR5DydamQbgؚᙩlN{;& S4Es-d[_[N[rDP}ԽULګ57w +^M X* #^A$kA(/*^qX v¸2}>:2N֞fۥ#M3~޼zdFUYL T /I0D=0X|2<]j6*\mMh~QԳepRq nS,67[ZFfx'}r1 e).S)Bz4Vա!HXw-[w<#CIMWKÐN]7I#gFeP:Wװ¥,%"M}j}N!B,M0J>~w ֮27l@#u<7d\cIx[̬HK`EC;^UB{yuDbtf)*)Dv-s~ū~g> +GB$TmD/%+:njfgVn$ڡ̭\x1EULUKwid9ah &){nLTȜ(5$-R^?ig쨂D()R,u5ٯ{( *J%-hýAQI-@HI^uXj!`ˀjپ {Jә45V(Tcv?M2 +KLhQwG 5C] < +S X6.[9^ +}E'Mz፪Q3tusuvfЀ6=+[{(Ęʋ4NcvKW)cϫ4UZ`M%($:#G“|݁VHa@'$sj}|oSRƍr +jmۊ&fKF㘾#1\:D嘌VQ̻nv;y:i$WSN+ph"lC=i HZYE ͈}/$~< ]bI%ꆈs"$tZnU?C|[&p8\A:69 +n&`򢵲=Fh%fiwJGT\I-`<^Za +dh[&9K[<᥾{-rhROť:*M}ZߥRHr0^^O6&i3sUiࠇZw:7 Q'-B霠2s)N V9 )eKMNAdӣFxdEĮ(ގ79Û;PuV"EӾcnxS)Ielvg]ԧR6k՝ӳ$mtۣTֲ&ߪAοtoz]'- 0ŗ_D4Tl%4dHG$ȱA ~Ҋh/`bjҾb{/ۏ{t7].j<,3(m  =wOt@h`櫨px/dh mC%ւf-2nmڴh [/8Y4PR]7)94-m7Rk[lj$Pk^`rOrF׸kǟp/R{ - Mnև֣ȩﳛzFQp@%{iy|#ƙ +-7Ngܐp`owXYFp4MDfUo[uS 1UE&Dvb]ARKc}y'Jdf}6[|l<еʷ$|Kh:l  fO;.j-DUg*L{>u\ihy:wg[SG_ !RMlS˒J.jIu;~=3^Ié +#vgݿyh =ځGpz0H, Tq8R 8r(9$)gp(%KK8`*7 {6:)cI0|cw&A C QLj|PX?u,dc\0өKn|&r.)*ve cp#7&UFV [*L*1;"BФ]vw̳} L U2ΑQ`~"px.2aVYqf"Ip\ <Ъ8|8@휷NGk7ucd"B1AY=$8Pe}lݔ͊hl]lt1û˫cxw㋫K.|&CV.%I]@b"3Ay*ᭌ9)""*r 5l..'cS4mah ڬd(sAko+H -%f, ;wfN{f]K%,}VɄJUkln|Zv9ؙI{:6(^᮰1fD!k3 20Y + ʙHDWZORK`Àɣ u+%ia%[0kMK_N4+U# ({0Y2zK+1`_w-!Ak㺐-YaOe>AbV|%z_b%ŏF0gXKVzhfr@?2Kn)$E)hv6e(ٲpt7CE\, %"I:ضkd X{S{-''EzՁy,ypqYw}եS Ay cD|\02Z9 23r%V) ɲԒ""B+omhWwrXɨ%Ar%G/Ä^~ +b5]Eʔap \,(OΙzvӘu>FCҶN3|J,e\H#N|?D`B=l<^xd6x LEM7T[|?8e<)J*e;h6X"yJPeo\;ף..4->]Nݒ +TLج1mWEkR3ɔI٪ 莙zhyU(79,KB +i`3]ލ\]ej^;:-6o#Ew 42͈@.;GJ+\Z Joy^+:x +/ Âǖ +S!&d+`4K AZ:dcӎ|uӖލҕyQvשY{YMpFL]=J٤kS3ŕf}a}=ijMDЇζS,h.US-6VU2=[~4B?ጒ{a6:NOYn }P̩C9l5vo_ +O+ө/TEBt"Kxq@-n,.S% TUzv`k|-5K.!-}.>]kgڐgmT)}w[U{g*q\4%ٙͩpcJ}H|zovyBs0ң=:ˇН_nrvvI- FiHBNxeN,[v[+'2PaUW#PKmEPuH 8T=RraօmkvъJn'Ӫٳav+y+r`Uj+rߜ|Z~պP)U6ЇI3xGLȋ^&tT\X-'ӕR 0 ES.]/ejst$XyB)}+YR朋R$g +H6͞.?nKoO_ @ se~٪]v@Z,REQ_lkG] veo[ aX5 ݏۯ1Q8\PŴAtO־=R;.1C ?Ŵ M9q\al &n$%!#2qjop7l Oyϓ E6I$Xkjk]!u2K0m +Uu:˒7nGL+<*{t~{J;qGo >^%ϖkĶA( bq8$ԁiNE4tz9L=y<̇d~ߏfp3,&)7dn]SB%My<9-6Ni}>9 9+ WRhST2@xlDAi6%oʦBHS}H<,<a;C͒ \iLy'.?(SYNNѮ< El #ˀ_ӛi5h|]TY%y 0}[ՖL7TЇSmԼsP vq'dA_6|FBK 9S2>}~6~w6t")[p<6z_C#Sx8W D8fnL8I1>1;l`FEdyhnEO0J B#=0s[QsfOE'eܧpyҔu;<,C: +S^EU[ 6 @ 2AG`W +%շl~|F'V"K۰= % ֨LI06ߊ(툁"瑧G1PWjfee9vHKf벖#5;~8m[Oa2Ӵ-YEc2nL 4`Ôb>86ì=-sR~`~|GU4Klic;gߵA CkەU~@}Sb9wq]Ues/y¼ɦwYWKs+o>N%p14dB|SL +c_a#֟X҄Q +gVr,Np'V~L {TϏ(N}W`t!Gh Lq*6\G̺Mmz@E3Zbˋ"2tIs8RX-:'f^|@ҥнh%Pv`9\, $ Gp+J1+ה][]9vT +ˍbLtឡ + H?av\=i|[:=w.]Xhf>zA)GX{Uӥ;fVs387ġL/4'fl]r:=A;}-bz>/YmOHί(!$lHFvnѭŠdv[Izqܹv_UuNz^8HtjJU:; tDy6DdYwЦT$L`5o\ .p4VڗÛ4SI6QQ15RejPJ&?^]E>` ר <I8VZ$R|0gAhSab2ҋQәLfjF&9-ҹW7F@Bz hӡ{9sT[3YRɅEqQ"Q"x׮21y zR]nY8eO=mb7`x}B=DfZ2h +eMĒ<Ȏ@)-N; APuSi "^]f!v؅Ϸ_>`t{={r; \&CVyaH TEe\ ESKJ'i8%UFPc,UF[k,~$R>FZ'Ó~_`O1ŴW!^]q$)2A+#y X9FS>#%, -=r +k>ұ_>kkM;rRl–Ƌ.r@GCؠyre_ZYE0WU}^+Gm8b/.w:0Br"_$Zm̽Gq쉃9 hٟ]JADcHD'& Q(f"F'lZ$ EW4rͳ)xN:{6eśHpwRlb8ҹEOFٶ)Q(̧,C[x/"\fWMqr|Eוa_3X/xcf`BI  + +0Xf:Y>_xB cĪMN/Yq%QI`h7n%ir:-X;HS~ME>;9P'.mD܆P_ l?\O/8wKYAlEF%.gMF%x@Oƶ*Qf ֝wX߅_%Mi*Uc#0ShxxdwuBBwka#ʺ + UbgkH ɷT ov)MǑ|*bu p(W0sZLžFܤ $%N$d(2hˍ5w\p:ˌ{b"Pʨ)=Gto;7adv}]N gMcc%f,'NbB,GI +`͝N ϴ݈\ڙƐM:@ D3QZk`̷͔߬\GojcѨu h(["e]g<`_Wo7;}ÄB1)r\H,N#"șj6Ia78IkCHg:RVv`KΎ4SYG`˼Fﻤ*nWrHƶ=,pXuve׌PсZJֻBu1&.BoJԫvkSfzc5P/r[S;C8bbuLөo!  LNM24(:*8\TNڠݤQ_kci{߼7Td+0+V{DŽگS茌Si9I(,."P(t~~O't텒2𨽝yz=!g(Du +Yˉ[:iqVpG<kM<#.h*KEsC7JXl/+Zo|}_Sf{rcNhuM~mV )[禁wdh朖[?lԫ/B&?-ۘ4m[V69"V&A!T9tլTuT<>QjTIs$jqSlyՖIGxNAYib҅ +Í`}*"76Qh7z4Si1ڴ)}L2 w{y-w(kZ]~4|y?{_a5Ϟ:Au& upmRwػ[ƺe]46+l~lu#{~ś~ږ)n7TY:(ЩlE6 qQ+Ú!Dڅbn -&}HP %MB$ԅ KO~V?.AfebN./?_Xmo6_q {4qf fpmQ C@˔MT4;&]m{QN_f?:j\XB&FD%s0 "Mt̨4)N,IQLIY<!Ȕ"pL,tW]24$Lsk6WbK=~t=^\BLi+,P'P1X#$˹gff\2^ M(wF[,ƺJ J#jFQkg:p,+HRv -X$di]e}蔤SJҨy !i0&;˲ v/i/.ֈ߅ +D^bƢ rE#< iILS wCo^@| >|N~~777r 7pq=m8^>oH M, SEYOb˓d"bxɼs N\̗JSj5:9Cz,aRi݊W+r4IӘ%^9?GyGx*b:-rTKl"4)PQ +D.`L9fBdVoAb[tOTRʤ>/akL8$"}M;f! XkʓWxzW|Ną.uJ*x0q^TR83IL`*iK +&|GT"J(d)Rɠ?vڟT 6՝ ٪B Bא* EUJ.w74 $6FUNU,BjM'a3-.[[ؽJ#x[s_Ww;;ndHػj,lIA}b+mh,M CAEk\ +CD̾Jj$VʡSECA.3P.T@iC},%-Մ3z-z0?ocES,MbWh!K:x-Y,BKTՌT=c lNg#I>-mvئ>@4Lgr?r1ʻׁCk6T66Х,{j0i_p`5]Y|R2wpc)$ rfLoEp<WCG%9p!l I{BY@n0n +CF? *"P}EJZ6TF0=ʡTC:,\`Vii#){䝳NĹA"NL[JC~EyH&T%]E5^$.vQ{);&Z$d󷷴믫ʕdq.6>W*xp{uT8xn_u->lj~劻V+\̘z{nENUhZzQj  {/_CKf5eޞHC-$dy+s.Z7/Š9AI6IgֽB}^!Yqd^.z5Ӌb:Ǔs";Y.=Eh(R<A*mA( 3pjc˭)mK+EzjbSEiFr{L3q +(D;Nٴ ?e`}akͽf:.-__y=ZϖEQ[tn!|;L' +%;Oc7@]oމ+3|~*X>f#/E9'vC{w_~ԜevWnq$b-}Z/XoG_1, U?8vaːDQn9>n1uwfӶ"$v6U''8+rdfDpF22׹J)3L2GL<9SdAӿ>r2-Lr_N"Dq> >V|zн1ZKЎ 3Aa.QcAY +"[OHJ$rq'bJ*}]ܻF> r/PEb:_jg{IK">3h.6e:Ư^QҀYW@Wɀ⦿cffs>75!U .6?bd{S4:|R5F\(hlVEllN@+ +#%uiZ-`ؘQ:|4/Noн-\\>t>]A8>ԁcP)r-Q)@hy3н,Y!\٪q5R1ƂJoJaHxwl2DpgIi?Bx~Њ$i+f%ߨS|@Uqye=B;0J$n,@c@"nT#4 Q˾R<6c/|0쎜W>F3E RRp1Wɩ1Na,#wiAU>ѽcRJB0v+c 7̈{; O(-,+fpC_w i$l5ʲl~Nb \"ttZBz;a{ ,b/=y 0pGHGGi߈t̻^֠s`Ӡ?4ei>W ;q׷lBĠ$Ą& ֋ '6yO3UN|*x\M?&,%A3B%f޷q}IaVPx!VH=w s>*!SZk9(h>%qVqGZDzkVLHio+s˹,f?9*tmr%Z>po|"gF@eqyYdO!-TC,+)׆,Oi0}@X |8S {);#goe ކ`nbߞk*d1pUL=$tBdŧ2KqD,fmдv$,!UAO4 0J" ,)ٶ#.v2)]CK|[/ty6e-_D}i,ݔf&JC|oi +߈RÓ^tR.1t(}Gw(nUG*>\WA=v3PCg^%jaW~Ih#=w+^]3vkN%7J**Uv?m'ƙBXzP.2 +w6-Q6@6߿oz pznJ{yr;Xث@!-f2# Tn$-9W1#®XZq=Xmo6_q kǴI5fp]QE@KE5uﻣHE-mAֽ~:_0)PfLd wx%3-S~]0#hSHyyFZaB|ؔLq"2p: +dI[*XJUyVb^ ,KK=rnOgwc ]a0 J FS,f),;RTd)W!xcT!c)+QEY'mAlS|zSlSOt<38NfwSl|=w#N>o>p,$0RAQO>By(bbzYRC"ﹲȹZ +MdX +cAIu#7ϒ7X;252oR!;K>DؿmphMĴ,T"FS!6RLSZRmy/$kJ<5+ݵ > .*:RzZl=@^2WKE bnzƫd[t{/=o["5>3(q c>}vU*g^dO^Y,[hR3&Y!c/)V]*'`#n̙>BH%1GqlwRK7"G:6sdDthT?{3 pSLWI3l`{UϝnqB:lNV@,kiO}qR^6?U8xq,Bew{쳽;QmWҴ>fѣÕd{kcSoORRd7=uZhՂwxۛKm/\Ti#Ҕ.(Ug,lONjxqq1e|?grN7ژ.xtQqUG+{)㬲2"`̪Q=7HЅR:Dxm M›oPFp]/nq ]"rtCX>v#D n&n%o/g-ݨӄ-~$ $RO`ȟ.&>7 {ғ:w=x\m~AH%c@ Abp0oo;>.T|?aW-Xk0j+_[(FhzL۟=98Rҗ7fh?G9ϥsa] v/=ks8+km%dYŏ2vV&K( H IEqf߯&@J$3;[ڝ"7|:# g,-8 +/Ó,-N@k&#VfԸ7M6.QyHGQg)ݜs{g9e1HDMrg<-c7˫ ) ;6PhQ"1(!l~Ǔiɲeba>rs)`5,z-$)Ւm3Bw.4N[VzϢ{f%[@gK@͓8J[R.df,*7iYe'";Y>W$^ޜҪϻ4Ee=Ր!(A)`́餍  @z7f\ܴw}w}ݻ_ݰkvruyzѿY..Oی`(y#i#K-RNŜq<"p6>aY\h @r1KRz)++A)CʲzԔM2֤U9#e'9J2wkp64=w PC6l"#*X~8&'O H ;/p)\O$U9p-J.tDryT5?}Jw&ޱZ,z"$@UH$!@\ѕw *4K7Z$-HEp9#^f#u!qvI'a%X ʄp)s9#))3HPCA"BmJ^LR&㉚΀&(ۢcs_rRMыa6i]=$mc٢/J6 `Wlu$qr9&ۚhz˷bX;f v56-{@+vY2aHYh|z,xpljV6{PCOx##i4\A1@ԌJjZJ 5P${ h6C#OS33x;ޢ!> '6#H͸9*H\9LC/5#0VŃRO4Lbo!*w +& n- l*.0 a8sKDfS:9B;E{jGfLXa3~X84{AB{@G&9E/sƘDĴ [H' +[/,2e<*.3بsbM2bE7 PЏ p/JGhZAG$`8\D eGsV%Jmc0O:U$4 é>d{oo{W gGHfnУwjз?%Q>8aMOv󡘐y\?m_^]p#w ,`'$Bjw8xTO{o.~==;{{ώA VZogzӿ};u>nOl8&vm : ~E΁Bhp(`M@+^6BL"I>J1πKHH/No/vv*lgcZDb&&6b6M8M-2?6[q)MDβOQ.h\+,%Rm),UK7fA+WxKk( of('>r %p` L.8 +uop Oa*ŵY!!3Xwhn¯`grjt3hK %IqQb&o?W0bزfr;FyTrUpڿ +3P0$)#e殝$"x{K/n#GےMmC[%4AlcwLfG׎`ؚY&Tikt[u1ooZ"w\ޮ +bS {#|$fO0+xŭ\hZ1ԓ44PpmI[FUlGy\C xWk3^N0M NWnP?1gZ0ˬ-\="Z+U\=9.h$sry8b1 +0ZbȺVB`DK,IX + +!,f|չ)5{8,0jL9yFk8okԶDÄe׼\r=\乱cvF6,71JNޯ;}}ɑDu+Dڐn x>㠌DCb +bLLbIqGi&d4Dl>/pOg2UuA,(` 5*xL[2,˄E-m (*Q,iF - ֡{P ûN+ef)j^Ze_d^*Q&AR*w8)Vrٌ6)Y&"q*wL8'F؍8MEMxѪ Hzf`rBMyz + pzu )AEM4 㪍SڂtcTgw8 xVH:zCmG^Ln$;| s"u>Tm6cXט­W%um(!Hu375L}\CǭHeUS>՞p_ ƐeSI, 缡Lhm3UzYmG_v[5Wl _(6Ż7rXhڄBhyɑT=d^\+c3V>_{{,t1FH_V~Ted:6~(W84~&.͗!*Df员T;~G%36hQi|zKZWNE"t>^[c+Tm/C+)RC4=7, YUv|T(wCu ͹;jC֖J4dղUlW ?]SP/ +Vca̲ZVp~FKšz˫FvpfZ +tv}{U$Wn NrHHݩ!'ͦ?kDֹ#&Y [`0<#tp[GT3_%ul[BoٿA-Y>Rs5ZIx;{/C1ۆ_B/*b~ܵrU. M9,-ϬZ:|6 +xO0褻! ngfI5hz0䕳 +lK1kwS#eTO1r4F5W<5j=Rxi4+{TBj#yleehr ñ>P'\ ӭѣYE&lCqwWz:ȤۜyTѼQl-g Csh #y{=FQDp#dh V; oSG4 [R kHY{49c? ^lJ=t|c֍Jby rZ֎A_< v~BBNB"gW+aȲ0<z4s`v6Ձ3 JMJ[ ;lQj8[SǿB~zezh^Q̵T镗v/!*b!&-Hk,ѵt&E=P(YԷvtH2S}U{ԻkW [U3ve XB׿uQd-sXYYWN#nZBGjc򥪶vnqRw jY<[Lw9ޭ' M +:vּ*@wx|b ƍh%ll »'J}!E)\H-D)OT2x%}_EL~Ioj#&k-!c[&%&ٌ]}7sa~x=Z.;C2\*VXcFO.=.>:J2#;缦Tx>+7cWUO4](KcX @jI e!D> ~ڑ5դ=u_t7, xۖj}ٌ{,UxP#]%QkWr֬KqCSW`8bQ54:Ο^yMsLmEw_x6Vuj[JpnˉitV/΄ұIN)=xd1(hX1Y0_F7}dHgVw6V0!mIJxRIV|JkӪ~>c=3#AZ%n 5dcKXS"1 +n?lOgճʱk:,bEQ! |4g" e5Ğڊv[ox:!ls boI k%T鶮+oZZho/zp]np/"ѩUT/''.> +AX5ڧfaM˙N/eȵdAhw +\pXSqaג)ü*:$>pWqbJŒ;yp=ȷA!M0H)z(jvG_qmiLRQQ E$n DىZN7tc8ϗs 2tb`BDf%ch7vfMEV{PE'X|_ߍ5R[s7lGqJ""/b?TzKc,Kptэ#M˹ ==3:g5+ bGරzKѶaJ;'#2z@QFj2I$a;Kb^rpK +7\!UK2 &="- @X\m,\#7Wm$y~߹+Xʘ)ЋVo^{ +CoN + +w~5F3r'+Xfa[6lIT:%ua@Z̪ +qr'~A?n滅Z +.yQ/< I,(({ sܥvUQyDSdP0|b_%^j ᛦpNoM\)u*kQag"-"@EZzjlcVEe!%)}yr}yž߉ M-v~,y}){W1hn"y7r1AֲJYZb^Z@S^GY>9On}^@ISQ!OtC2Pi)bJ&ZdU/OUFXTu,9 +Oy[olϧ[.~-UgWj֜m'{aGy_u +Onx=n>Qn>5fGQj\V NƠ2G#(kWHQ]g~_h40)b ֞е e,UβZkBxs!,/ψwjTfw5n1iz~4n7I:`CX/^<u}L03arr|wv_jtӳlbS:';;o XpC49:xJM<% ~5Pt*&o 'A:\q,T#33fgR$a +ee##)Qp鴼^ҧnH42 -rb~̋ 6b5L%yr5|zꦜ@c$o]Dt!y` +c񗧧K kϽ<<y ycl`rŵ +bp*B1IXϟ> ˼}ͥLl^#ʡi݁~=2Khn$eӏe2A;꠸,DE\r/`QXDt]~WSy)ƱtnmaYݶt.Q8Ŧ" .L]0 +177q3X/ve)p>&󄖧ƀ*R 8秿Ɛiwrjr$טOɪG?ZdIy: ['߬?xF˼8vu~#bn5PYrOEl/IfXwی +=L5[p +Jdѓ/C5SQ)89Ō%g9LҕhI{L7UV͑hBGCmhT,0emaOt(mfG)v(T.~BtY.IQ) 8El4,ݴ(h#'*%N +Ҝ)kitZ0 LmgRP 1|V668GH-KbSov3 +p隩 + ~y%Geh{vZ Y|D !iQlyfAjAeክ̣ hZ(Z;p%ZL$s&1%@""W!︾?},fa7{SU_={@_m-V嵢(RhNTD**iZfI=Ctu1c;f<`.0R<P*/__;1BZyPsoLgYNNl`᣿Dm&!;`]?JD`\(]Mڼu>^+vQ OA&#nх[M~E)өnH5Ӝ2aUkѮך |*h>9՞ѤJﯲ=J U7od-{+G?|tޏƾ/erׇwekmmOR6NOE/d9ݜkCz\L]Y5\pmmq,Q:vxY V6j3=ncL/*5j}(]o"TZD>%),[;hmW;lt.[xh/\WP[ Ly{ nwsTwݼ[^5hil{;h_pWXmOG)IUӐj6"UB>qaܔޙ}3iE^Uݙy晗E`NA-8?Q(( + ]!sSP8?hVLp8pʔ{<:mrQI:1+IC`4 Η gct|uu<NFpq/Nx$?:24cAN R\>9 -6N2?=t/'laqk"bK +DSLtRI-}Kl5Qiw6Sz=?tg^O/BmCRLF9sojX.AzեIZa&^+L;C1jM XbQ@c1e<1 UK S;?dbfZt%X$ӵ[Ęle n˳Kh. ,1<<Ԅ/؝*"qjL>λL4z|zS +ZC/UqNWӦrNbcTE2uG79M܇. #_얃L`BqACX QK`r1VCsY%um) 4ݖ'^U"B+׌۵ c1P:j~:RRhku&e!WF|pw4;>DzzWdgg稕.3MQ}88$*)}:K^cIeVzܰUncQR10o؞86R q|؁Sij SJvҜv\gLT!8^*l:IT`\eIbnnD )lӏt?׵"K!)kl>|L @k!8'~-~xQ5^%J?rxR+dEN'dx+S*|{V+Rכ+vEIbKz6(hT#zYcѵeorF&xJ1`H^|6[J 6rkI$^U2%4i.¹XHpyxd_0dT=M ^j m//R1JWLw\u7Oɵ{mqv0נᛘMX&j,:([?qF6O8aBrS "9y voc0lmp%`urP:yZ,a4su'BE`0^kՒR$:->h Z>(I{73{ǿGQ'W?ԚǏ8<3I("LRE </l-R_,OaUP8jj){5 AJΦ+,"O͗= zH߸*Ђwx&ZUCR5`h-:j04zݪ u].'xYw|襬|5Ͳ0d{qԕvvFMbk#av8CNQ 8VvyEAYvg<1/L_¼m{n}(JpSZw}>դC /²r@*Ya.'|z)b8nbCt嶺5<mrQHnRt7ty~TI"VA#k؏%Hpt1濜7U/bLGј#U4DAwιjSr_*D5q?]}Xf]O~ÇǿtDDs_ςd)m#c;-*5.*(s+׸CouP$ERg ;t8.M9#0B[6bY}LMJ%j>կ[[~>y)G)OW^?}P~/u^.X?R~/YmsH_J-"l8VNI\%` I5߯GB L.Y>y4 o%Gq( Y^x?^2 N,7>~o[6:)R!ż d0ͳ 搧83+ #,bL[dK ua}58-E 9o_-pe9K}ۻf7 (҄xvw74;kسnߴ^@`}fb4l.1X[Jܳe.J[M' -2kik{=+m4*U!'uǎuEω;= .#Zk صZ(3[ j;c&=,<{8h"!Dc=й&/-\Gp&"]"^XX}t-z;$Fmjrh9K{l%d>; uSpnk>&f D.Wq@_gğ7Č c~9&9(UV]!V(e:n_|urt5U +WE+ =:"Gԧ,Fc휅9U +|²5TpЌ~¼N ~` KsaJ3MY {/%` q'vh# *+~KųzzF 31V;28+?a/#!%%RP +?L|3+)G$=yF6eE0čOii*ㄅã 20йśvVe:^a9LD:+qEF&6cn& 1SL(zM)\FpC]QA +`6h!@ -FbaN>]NTU: b#E S_Bj <Z64=Q4>4*N'g>OՠRh!_e,p]3Bw8TlKՎ]՜EptOtd$c'43z8NȣF:J.c2\UC ^,X 1joDyKU"Q$ &o@@wˏ[_Jf/Ǭ g +?J7|MY4q%9_u~/2J, яDN7PFiȴ04"!T7"a~$0U` *tS<`k:Le|'"tJ4@u-.<A}`p8<ROc9؜Uv֙x(h KS[4gxpJB `C]*kLVen|F; n! }hV%1/*K✪qwBAU@ť{s VMӋ?Z'G)MX]~8 s$kp-nE"qg>-o*NeyMX6i^u6^`*pnAXQrviSjtuàd͌.'۫{rŸVԨ%U_ LYh;'B78uSu+RCl n(㪏^o2tTܸx ]&soM&u x aoVWW;`Fծ[d\ccܢ lo^n{5F-onv=¸@9T=&7ϓkwLb)ͱ7t + rH?\#ԵGHmX zN|oX#kP%6 Nղ䫘15t$5u%lc}]6۪;5Oz)W9fk󴲧zz=/OW|?84#^1ӳJpxLM`! _o;S2AqgK,06[c ?x3f /M0|fD&0hkk{6 reᇜI5>wdS4oȴ%A н x&ܹNe3:Adr HG<MJze4sqY`źissk,VnG9j% E;م dtʺ+ Q9R3ooApcN-B#% ]ہ +qrD RiCY;+3_ rZьŠ&}L-@rn%4ﳃs. oya]G"*mޚ;3҉YS9)MWEITU(#(%>opj|T ~_O^&-[ob3|/_J`UkIOO,%XC\Vks9c eوַ)y3J+W+Z8;>>fH>žw䱓9{'Jj6i^ZYq<7SgQ~_\g57'˷ >~PÍnϲX8`r骢 +EEHjiԚ3T:am[&F~,V2S~u͛llͧ 70c{(S؃#X[ZD&۴ +BY?>'V>%:Em]/F;t~77o+.Bp䊷J\DIJ[Rts)nƛ|Lf czV0'HR(HAq@_Z%Ybi'ئ;Q+GPWXi}^}Xm#҂N4~sh\,= ȥxw9$.tӝ]~_ Vۅ{!(9VBYYL׍D) td)" T^yf +ykXy"UsvY<`@nY榘ܙ|qƕ~ě"JU{EѴ|\2HlEU%Fܠm'W, ̏"ܛy>j0 +3̇Ɣc'Ȥfo +I:r~0N~A5Q)HqLA<*ȁxƽ/Aj΅rEY.o$ DY}9K5bѢ1*dl<ѐH&A#<)i=|0䝨#ha:ލȧZ*IJ{v9* 隫=op]ޕ#j;FEBx,VqlC,?@Jwrsh5vˇ|tO/@x; 2N:yK3 OYTw6xPD+Ok+[F|o-Sô)~+ +HUTgJ JBҟpwTd_W^,EP0A9UD_`RvByp 4#.: +J9f~Az +]>O(!o+:ެ:S^U(2}]bcT=x?yڱXJ*78+ѩ 5nNB$'Dyht,73 SOQЊuo \ÇFl4/_[GL9pi?<8MGApPx`Xߣi2&/ g҆mh5wnHX_XǠg>6)`hČ V㨎Yw?Ոt `pq쑣F?\,U +o93(ɇYߓ fZ< KcgYxirѨ)HZL%ȋTD|MAZh@y }Rv+ȟ19`TL:*J-;"oY`+LYUQuS%ڈ6?3vӅLAՕ*AjT' PV\h+\E й:N@!&:֏J ˖Xպ4u ݌ FcqtTG H>DXw`&SPJ8!dݥD\<,}lBU#Dj ȹF{ + #ދegjzZ*{YLY0#^k;%(>Z\qH8YU=rMhi1kS -AKD:^դtE#U!7mN9DL /hJ&Š:4c_2G{t?5ρڍ( v,'D#7ǻ$52̵.kݰ8JkɼlrV΅#|eq,ary<}Z/yuUHA3 W-_ԢY%= *FO ^d\x׺ R~Z$d+CĀм^Z1Mf1cL j: 2y-(2EAt-&W_L?o_kLρTmƩWnNX-}G.PU6iR#ΣR&ŝ'=V9J͊ S('s< /Qb/d^,&e lɹ%ԙ"_՜s< .=VۢgXxZHL]'X2ږ&/+ +/w ZNʻpy'W*Q6uQ@\T(ёhZv^FaIi{M4Ѵmbd[c7(sxpI`(>5 ?6ҍEۓL:yX¶963=<{ +mC%Rl96yi{gE _&R ;ܻ](5p +B5)Em;bf񔨟)_1zWp?hGQ +7klU!lGIoYHW}Rlϯ5D#::9ƷeAt[)-T.vtQ;Iźea_Q/޳-6z9S`-"zC?I)r ?r>Ġ{W9쪜^ +)ErPkVI9_[d.O86oUCD9?hMC+Bg}׫Y%WTp+C=@`;6}yqJ\~˱-G{-(Cg]E1 +r<Jm@'"-ق%~|&VK"U{@T]O0}ϯ"TE04mo PeŚk[}iB'$Ͻğt Ih5ew-"kPEa0Ab2a_ـIg^6:2:B9Z5jQwH$8K渒X0%39Prxҵܞ_v=45t ߹79 :o$<)%D# +4um D痿tѿ!7@>qkё=c5.G'>):!ˎ.5`>jǓ'۹$֨yPǒ,er(/-GJL=HXgٓJKΑ|u})Pcq +I#^sbL'5Xn \ݢrRp{x+P{/-N АjOOj|\nöun0 y +8jM;H5RI#ABNk;X5_b%|39eqOޡ&d&{"/NJAU:Ga:>K!2,=ȇ\owl(Lv3EL@pF.|F.X-^8h <7Q#S5k=//H>] Lvo-wUXOQ@(֢~GcɀtKIg!y 2=+f  6Ơ7 sea^4-5A[!uS-|kl +~2a%~4W:LHNRE +]%2WB>{(;-23pln0Z?*8>Y>d:'{7j%I`nPNϒsF%j~ӏѨ>D)^\{bیLٳC9O(+4L0G v +jp{KFYj:(ı dLO浇KVŴMJvPI\Dq*R PM,U7gDwM;?9vǧy=q|2CD¯|CT*$4ζJDthQb. H(DmN g'Lkt1 ) ~uf0[mWvt&6b :5P|Q9N:WT*Ht%ܯ'kL9IJ"GŸOQ3&;gOU]8=>~ +9Zg}ru( xX,P+Rw[4ڸAײ]?XqUv[0T',˓k6 &ʾ۰ACukճxDacvbC,/p}V@w} t?l?Zuջ/Z]㫆aqvϱXr6}W3jI94/6θI:GXi]Q$H)RrDŽ7Y%6"ޚIS;8\]W4%%(}dPha44d )] ,z*wu*!Qi5,Bq;6̷&ugdZ5u2>ΞxUEe+͝A/lQWo|N`x?i:CQO)(@=Xjm3S%hȩOI<|amh6yf쑆pFxQGŸ@?%tawaA&Vulԯ1iDn = `!FsS)sp; M+^|.*{O o@7tM5Hu40qlEũܒ|klJe4 3n#tGx!b]+Vϲm (M- SCS`X18V(&Ul. [Oe@ 1(/moYȾՐ[v}+?*+]]Z_ڠcFZoJ=Ŷոr6Rts[b=ܼ}0c.8ISY-`Yj3ݝ68~}B^<6&'gowz@8"em GˮK舄4#Ў](>v|M%G"Z wр<9!cmgX&2 O3$Ήcj x=qa@Y (}b"[s?bWf)ϏnH= +Zh8lAR9dh@[{OH[bf! @1ݨ6ql4:l,x" +;J'0ʀg@PφNkL:D&~Ր1˖YP updEqD_\7x^jT[Td+\-fSEӉ)8Pxj@͊ @D_*Hn08ʟ+~2KQbJSYsPb,+Wul3íteB y|UR熢i.}0 X0zl3X 1T ͕0sp2CN = NY2W.g2(ػ@F7TiD W>4;M;XQD˴!0 h{I5&0@SfY,'&W$]r}:bS٥>aMZ-t2oy|&ɇЋ7GQelV"9oТʃ: +r6D{1NOu ߇1][!~?:2R_$+q- <}"K9WDsyno>qDRW\zQġ.fe3aiUB*d'oGGX7yiOr/qaQ"GIqRrƙ4\MN< loONXBG=$uf4Q9aW 21a +U=M\F{&{SvE NG,-<#O;!A?Kpg'L8b,>`<+?ZЮ*0cN1 +R7LC9?!ܖ 5ocɫW cR&;L2gHo (H~ZlR֢qޒ2:}r!h;x΁yDX[2:,bg$Z&oyobdA,uI:b9B4ѕSdP4QcvMOڇm(pxg3N) =wTZQz@xF J=;Bl>3GĜS _q]'DZ^>WGSvxyq̈O~ϯI|7Ci+p6`#vŵMYU[''\AÎe^մ,[h2 w`^i;4NFIi; ؚ楋BJ, ѐncѻoȿd ˮxl(}xwITdّ~%y7`OgK'ކzm9gc%yn+XI?~Yہ+E5n2nTm6 so 6Հ]>?o*;(pI!hI iI P dҲVj\Hw-nBgҳvUoEi T f4S:@tGA>t`?" {ld4 U7шfnXLri_x'9xc16pM7ލp;hhY` ޟ50`?qARG!7bؚuG#omްoOU\UKKkΉ*Mn(P:kKQQ8.e&=*:GUEh,U kB~5+ K2v#-5@:"?.pM!5#]6#V3ah"jg{\T-q..imabF샀 da4^j'Qւ]p_t +U١@Om{?AQol1-6d0] vflm;a0OLQ4WK{+ +>T}.Ǯ˾P)\%_8ӹjZQ-v"D> -U>:j»VN kjqI?n|< +PkTmk=Wby \c]=I8P@+l[bT3l% .t%s-F]tk< ^61ECnc ]Z`WWƺ%P^ckPߜE :V&LF^x +}~F9ja컁<É+ͨTu3Q|nHߝ +dQ+%4ٲHp<3 XȢl":5>%sΚpℇ~4P;|3q+]%prw{mke/_y$뚒/MI@,hlq˶ GY6) {hUd=:vYwqjp^LLl_:oiRr0޽]~-b02st]ZU۟RSeo>͐K\ 'ig? ~#.\#W !mz`Re.Y! w:XQ{p¯킾.qAПaCp`<](0-{JFmO|vfÍ0hWQx +Bn+:jcv펬~VeZW˰u=:X[o~ϯEZ<\v󰓝`'lH6V0xiH6~!tW_Uץۿ}x8 =Z.xcFk{}1wlC9 l=;=;bh8dKjV2S9~5Gcfdq&M^`|]rqbcǴ/{vftzN%d͑cY<{yc3nmz#ӻV." uh4ԈmxYDܝ, \w"[ޥ=p\_n[C4CZG.h?²gyy` +#LMԞX33 bWmVL3)>p%*39 3̱ϬآUlld4V>y)Kȗ*%0"v>_ϫa=TV&VlHgXʭDzh M cGLb4'_KTA;sh)ѰkГ$xqR`/L-i a?He8y}F]C%s + +8$rf2f,nJGbUjKZƮ1w"|yU <溜;v/JHɱ& +%Ꮔd(Bon6qu<ˣrO] +*;-όp7xn4~ĎwBQ_P t7FtFT!ЎjrvGLB ?TyY [M9#+~P}Ȧ]zQA%;!# M/,H:Bri_ p+t uavbh4KfG!kCOdsu'rN~xK3o&_ހ0j馺nQQ c.4zP]5ڴԷ\+qt ꩲ_fcXS:zwG; "9CnKFW`XŨZmD˯Er/injII|m u}س +X6#IwpޱlT8ꚈrAĚ*֙ўtj**ۤ9<\5Yqq.ZԤZ;J3]CS9`;fع[^,^|)5s_+>-$i+t[ cc=e=.8Lߧe飄HrX[|8nQ-ӯIǝV5Yj+J'M55|P=J,R*W՝hE+؋s_[ta7F8U%D䲻kUIHTYxg*ޯ*xKbTqkVY3 QH>ϔ݃Ʀ9'v垡հՍFgݎ2m7x{f硾1&n]ZwIohwުvշ7g'!W#= Q~9wێ$ߍK f\7>A%r>U]14yY`*(wpl"TyYM-4cW 4Z4#_2a]^OEr7P5UQo6~8yp5 +aKׅh,y"BhG,z wYuۡ/Ӄ-atsu5+E%۟~k *?Kx.M +\-OukJdQF)U Y]@k$5\MYgJeJ6WE-x3R˦z* |i$Tz..Jg\^6yW mO*Wzz ZlWVMKCt) ThqfͫK}l0@ V["Z {Y7Nop_:hgeVsуB%Ft֧;ZHRD lm$D 4J3e LW IlGآSĨmЃmf2}>m۫͘A%b8x*V$$~` `F#?^6 a@$ +p5 "ƅ7cwxF5Џ˄rql aDQ0 X41-@O{5`?O2a!kuDd3N1%%IӐ$i&˘S%!a \# F7+"Z Ed.VvzQG$zg~XI֮BEdNHa3Ա ]XBt0)i| .$x֎(}rfX,4Iҥ`qt"P!dJ0:pZǑŊŵb`5Ql#VbYQO1(": ٌF>ƭ뒯fNmnӐ[:hgm-)Yk TWyϏ'埳NJTV3q4~ N8F@}v|oFn i Qr)=m{4A8Pv8k!.jKo0%!w'wFg{(Ucx >9KޗY7͋לJª?Ax#f6wfU.eݻS#kdXZR[obנ]3_([Ys8~@Rޑd󰶕 -1dI+Rɸ`eTnD0}efD/4nmqXzn#`q1iN[lOɁW4#}sF?aoF4MM#:s8tϖgdQ$ +ᔲ/gw<Fn!,c2f;u< nY;?x^pd3EӜƻ^[DTi0e="[,ƦS~SqnH܈xYA+:wNM6 UK X;[Il1sz:n@u(6p`hb/Μb9J缂0J;wb % ) 2bJ p$= DC, hAg 1|hQ$Xb7}d= ]KN dd~9Ѡ5F]ڷG=߲mzGeÞ @Hۦaiwz9I<6mW͐t&Crl:G=>aRMAN6;>BNh8 &vMc j\b|56^Oj1!  PV?\5GFF_#(ӈ54:&0~7"}t,2;:h']X66 *x3ǨYY6m/Ay2F_͎ab[Bl]v^f}0L219 C׃>5 _t +|;2; {A1:NGwX-RT-KƗw l oeXhL iL.h>4ЍYcCKCw<'f!1ָsx?ʹ8t^wg s,dӭ^FZZU"=@D?bX]д0TľTiv"ã!phpbuF]6ʴ'?44#pI edV ؒ);ID6ffq3SԹa Ɍ:Cg'|g<A!էhpNXsn|*8r+|q$z9 8gK5YhG;3dЙCd. 4ܫes G4ZzмUQɚen~z\%ճC D:W SM^1lCҍO4!*[;\d9ſ'I..L]ʒqD+ ߿/:3]!ez5VI^#`i=z_~ɸ@C=v12$%>NB#RZA>灲ұCRp.^R߸ _Ue]I +҉8`9~jP-#ZH|x$o`jb` IgE^gxd A8 +5H1zOha{!We$"ve24ɡ%M i!T5AT"J'{d)YXWƪ|!&r|ǦeK):P/*0Xz )WYj@[ +#bmE쓆-qc +bbdgv=q8i?i}*ex &k$da 360N/*zG%RmyN*$aL/9M"!IܨA1]1q%spX09Ǹ㶫:6_ Veĕ rR@|;wՃ\3[#i1*Fk)(D?uɢ3:j8Uk^5; R%ɪ*UsQb/C5U"bSЪ"f?_uR+ ( )]`kF-_t0CKﰴ%[C6\vA1;ԆkŭͷJqPee Tk𔝶ERҤy@Rjg%I_je=q8iY;ֲQ~*$+pBzN!}͜@K&՘b4ʆu璂]EZ%F$):(|gVjэG~?xuMS\ȮdEd'beR=,dy2~T1}RDBnTt)%\$U O^#kY*x@>/YEdHv\k<0Н"oBʺ/- "`7QF6JzD9+F@qCAƟA.^$\hvV:$'щ#*pJ|rlm&ҷ`TN[E4N} +Y[eHU{xY]gWsՙj(C0=z*L :s5_"lђ?j^wYg'_G/҈|Y'-v;3y;M +Z9}LE:_w$qAU GrVƋQ\;䝭8Tm.~ '> +~m_U֊Y-db#Mu%H4+qաei>5?}:aT0<^-YxH oٌ Ç]c 9a9ia>I#q:%n&>ke|"]=xCtˬnQ" Åa\E*XI#$qDj ]GǕ@{+6M1p+.M`'ȋ[~&>ٞ+[(?Dž[5k|*X| _p^C_tMOs|/bnm˩\r5q`U! Ma\dERR+3e <JU+iqۑy8!92Rep^~yYo߄P27"Q`B-H.=l56<%Xa#U1s5 x +QL7Qe0)D36=SX4F5,+P0ܐ@4WjZF׭+qF +bݖ  R(&1:iMCe{,O ''yuWAxƚ&;;"25\´K&Un\)SnhYkfp%NwyF0$V>Q= ni'wn+'6O\f^c_,3(N[ E>9fiG8E>EAއYgEQ-k;e?T"5*bw],x?Xmo_qZʸIZ)Wd$A/d(,'k]s@.l9̙YoS7]q6iӧ>|:xFFA$\P|.8& )Rd"<"#gxGiBAR +252 [4R(Qt< i4 @/pLBd(EH,}B ǏV/QH4 #֕Ji.u;%IBk)s0qSE4&B!"I1@lDV,ʓ8"F2XPWa".a8\$JH'[ +A.(.9* +P˶&\V&nZnXc,5V4L:xHB욧u`PXGH) 1a^B?bfLdMJ)[ˇ;rt7x4:VWoWX֠Vw7m0tg۳n߰n1dޙOލ7zgʮ^,ؾNZ|ci3}z }B23nkUV';t[v*a-t8= tאַ]PT c!yH"qzdzlt#bBO߱>06FG㠃-L!],c8uߺ6ɳ[Rϵ(^ jʛI0pA , edS<0$V 5jB (6mcLh02x_΂n"xeȝV*·Zts1.94}H}܊4]& F8pѪHƷTW>#$aZ~nywG[B21%J,%O;[]$6JF*})""|hx|,}Dw+yaC#{TD,:ė|D%qEOIp[hZ:*q:R-F}j[C + CAnymk/UU7hG\]_Yg[xd8s9ՎQ,XrPʝ|#I%O%y^dEU4ecNwo/բ/s +8컨VAw)ZQ{EB,uD.j)%~)G"YuQH8He<^fE0iuQ +$^o#Ɓgr&oa,l+JnYJI 2CCZ~l:$Y-TFZ~UgyWmoH_QEk:L(Tߴi:Zl@gri+(CS*Mˆ2*.:-t]JCHY֍Cw2429Wtc ^e[zeSx ׷Fspl$8mX7 a/ͩOİ Mk mtc5G>#kFA:y3sd"ýS ˞9OcƸFCPNh7sŦ-t8cżg]xgp: +X6sbؖ5Mם|˙@-BNJkg0,ǽcLJNHTb&`:<8ے +>X׶umNG&:ĺ*-X*XI~}2>l^2pb4zPIu^7Q>4]K>I"zcWlz dA?{=VQӑTQ{pK\ɗ"DQ}s%@k#/_Bu~쳌<EMYv5 VX觧ز@DvqL`ȣ5wԯ%vO KE dC`!uہt9uZMC"YJ&q f ><\~|ߦY!0>gaTzDKe"HJ_f֔ TU\~ƓPc9Õ'4_\/YeotK\iJM)6XY~զO}"i.6YȤHN|pdbqIk%>л󓳚e,_b61\;;;J"~2*lqG:Hr+6|,>,qgDE<,iࢣv, ܐ֥A/w=]fV.SLiV^/布cl@|Y GLmy?QGXJ|]&ɡoMurE \lǨpBH/Qj{:.M/*Ƶ9, *A\pND!)q3AdBa$QEL+QNsΠj@lA=v5K rc"hā7ڬBLrn1:LADuECT|g,C>(tJ]( ƉJыI$@烆\Boyߋ]:Z^ !_kN=r)izԖ^~V]O8}W\!F-(|,>,̒&Z +I7N`*ąhҸJRXPʈCs9|: G͟~O'';U)iP$OY55}MпL~o PS%kY=h5׆2'&W%%eFZR^RU*$/Ꙧ=EC3-?GN۲6%o}xǜ\")zBV +cp5J&~pٻdj6ӷp&׈äxJk40֊2q8YVUW5.5-^sކȭT?{ǥ䱜߽bsvX`<ۦ%0},ryn[FYw&X8&b|5,/hIPmJ0s!l >.Z +Ŋ Ld;t!C9sz wSIW! .S^8#41|9pʁu4n-igi.2r]FÏ@t %؀c63ZS;:,-*y^+,yr}_hvC7ǧ!<~dwT6l|ۋ0fz8j<:[_hu9^G9Y%~mj0 y +vH`K=6= &VRS[wliÏ>IݱK xT$N5G1D +"0 z-E( p҂(%UlVar'A%^ \zAմpN|UUUYq)! .iI +;iL{6OwxØl]샛O3η]5gm垕l%fd ]Mk09P `wz(vfxXNjqy<}6g9};ɭRKK"kCs C^50`mfw.֊+yVUUU}Ɠ6*GP>K؜]V`})=Fҷ:?CVRF/f[PH<1!|5ώ,/hIp mJ0E l ~.Z +Ŋ Ld*;␇K̽aru=hJeI_ :S}G'w: +a@Ld4E(aiX~2)km*ݳ:-O3.OT%z؁ff :Ήx%8,+Ӻ.adv?=hMzkrmRmZ߉QaA +:'t&6.򇦨Y uA +@ Es\@@BQpgCh8PSo{?벆T$OBXiYP|Q~3jfK3,n>HAԀXH) q8 diff --git a/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php b/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php index 8ebb908..4ac8fd8 100644 --- a/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php +++ b/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php @@ -50,7 +50,8 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit /** * Constructs a test case with the given filename. * - * @param string $filename + * @param string $filename + * * @throws PHPUnit_Framework_Exception */ public function __construct($filename) @@ -84,7 +85,8 @@ public function count() /** * Runs a test and collects its result in a TestResult instance. * - * @param PHPUnit_Framework_TestResult $result + * @param PHPUnit_Framework_TestResult $result + * * @return PHPUnit_Framework_TestResult */ public function run(PHPUnit_Framework_TestResult $result = null) @@ -177,6 +179,7 @@ public function toString() /** * @return array + * * @throws PHPUnit_Framework_Exception */ private function parse() @@ -205,7 +208,8 @@ private function parse() } /** - * @param string $code + * @param string $code + * * @return string */ private function render($code) @@ -227,6 +231,7 @@ private function render($code) * Parse --INI-- section key value pairs and return as array. * * @param string + * * @return array */ protected function parseIniSection($content) diff --git a/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php b/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php index 8959cfc..f21509b 100644 --- a/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php +++ b/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php @@ -18,7 +18,8 @@ class PHPUnit_Extensions_PhptTestSuite extends PHPUnit_Framework_TestSuite /** * Constructs a new TestSuite for .phpt test cases. * - * @param string $directory + * @param string $directory + * * @throws PHPUnit_Framework_Exception */ public function __construct($directory) diff --git a/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php b/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php index d98afd0..152bffc 100644 --- a/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php +++ b/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php @@ -26,9 +26,10 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator protected $timesRepeat = 1; /** - * @param PHPUnit_Framework_Test $test - * @param int $timesRepeat - * @param bool $processIsolation + * @param PHPUnit_Framework_Test $test + * @param int $timesRepeat + * @param bool $processIsolation + * * @throws PHPUnit_Framework_Exception */ public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $processIsolation = false) @@ -63,8 +64,10 @@ public function count() * Runs the decorated test and collects the * result in a TestResult. * - * @param PHPUnit_Framework_TestResult $result + * @param PHPUnit_Framework_TestResult $result + * * @return PHPUnit_Framework_TestResult + * * @throws PHPUnit_Framework_Exception */ public function run(PHPUnit_Framework_TestResult $result = null) diff --git a/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php b/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php index 3a50988..1f1530f 100644 --- a/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php +++ b/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php @@ -92,7 +92,8 @@ public function getTest() * Runs the decorated test and collects the * result in a TestResult. * - * @param PHPUnit_Framework_TestResult $result + * @param PHPUnit_Framework_TestResult $result + * * @return PHPUnit_Framework_TestResult */ public function run(PHPUnit_Framework_TestResult $result = null) diff --git a/vendor/phpunit/phpunit/src/Extensions/TicketListener.php b/vendor/phpunit/phpunit/src/Extensions/TicketListener.php index 5148306..e282f8b 100644 --- a/vendor/phpunit/phpunit/src/Extensions/TicketListener.php +++ b/vendor/phpunit/phpunit/src/Extensions/TicketListener.php @@ -64,6 +64,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -76,6 +77,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 3.0.0 */ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -86,6 +88,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time * A test suite started. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -96,6 +99,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) * A test suite ended. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function endTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -184,7 +188,8 @@ public function endTest(PHPUnit_Framework_Test $test, $time) } /** - * @param mixed $ticketId + * @param mixed $ticketId + * * @return mixed */ abstract protected function getTicketInfo($ticketId = null); diff --git a/vendor/phpunit/phpunit/src/Framework/Assert.php b/vendor/phpunit/phpunit/src/Framework/Assert.php index 4da7cff..1e1125d 100644 --- a/vendor/phpunit/phpunit/src/Framework/Assert.php +++ b/vendor/phpunit/phpunit/src/Framework/Assert.php @@ -26,6 +26,7 @@ * @param mixed $key * @param array|ArrayAccess $array * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertArrayHasKey($key, $array, $message = '') @@ -56,6 +57,7 @@ public static function assertArrayHasKey($key, $array, $message = '') * @param array|ArrayAccess $array * @param bool $strict Check for object identity * @param string $message + * * @since Method available since Release 4.4.0 */ public static function assertArraySubset($subset, $array, $strict = false, $message = '') @@ -85,6 +87,7 @@ public static function assertArraySubset($subset, $array, $strict = false, $mess * @param mixed $key * @param array|ArrayAccess $array * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertArrayNotHasKey($key, $array, $message = '') @@ -119,6 +122,7 @@ public static function assertArrayNotHasKey($key, $array, $message = '') * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 2.1.0 */ public static function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -163,6 +167,7 @@ public static function assertContains($needle, $haystack, $message = '', $ignore * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 3.0.0 */ public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -186,6 +191,7 @@ public static function assertAttributeContains($needle, $haystackAttributeName, * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 2.1.0 */ public static function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -234,6 +240,7 @@ public static function assertNotContains($needle, $haystack, $message = '', $ign * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 3.0.0 */ public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -255,6 +262,7 @@ public static function assertAttributeNotContains($needle, $haystackAttributeNam * @param mixed $haystack * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ public static function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '') @@ -317,6 +325,7 @@ public static function assertContainsOnlyInstancesOf($classname, $haystack, $mes * @param mixed $haystackClassOrObject * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') @@ -336,6 +345,7 @@ public static function assertAttributeContainsOnly($type, $haystackAttributeName * @param mixed $haystack * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ public static function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '') @@ -374,6 +384,7 @@ public static function assertNotContainsOnly($type, $haystack, $isNativeType = n * @param mixed $haystackClassOrObject * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') @@ -420,6 +431,7 @@ public static function assertCount($expectedCount, $haystack, $message = '') * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.6.0 */ public static function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') @@ -465,6 +477,7 @@ public static function assertNotCount($expectedCount, $haystack, $message = '') * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.6.0 */ public static function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') @@ -535,6 +548,7 @@ public static function assertAttributeEquals($expected, $actualAttributeName, $a * @param int $maxDepth * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 2.3.0 */ public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -580,8 +594,9 @@ public static function assertAttributeNotEquals($expected, $actualAttributeName, /** * Asserts that a variable is empty. * - * @param mixed $actual - * @param string $message + * @param mixed $actual + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function assertEmpty($actual, $message = '') @@ -596,6 +611,7 @@ public static function assertEmpty($actual, $message = '') * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') @@ -609,8 +625,9 @@ public static function assertAttributeEmpty($haystackAttributeName, $haystackCla /** * Asserts that a variable is not empty. * - * @param mixed $actual - * @param string $message + * @param mixed $actual + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function assertNotEmpty($actual, $message = '') @@ -625,6 +642,7 @@ public static function assertNotEmpty($actual, $message = '') * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') @@ -641,6 +659,7 @@ public static function assertAttributeNotEmpty($haystackAttributeName, $haystack * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertGreaterThan($expected, $actual, $message = '') @@ -655,6 +674,7 @@ public static function assertGreaterThan($expected, $actual, $message = '') * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -672,6 +692,7 @@ public static function assertAttributeGreaterThan($expected, $actualAttributeNam * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertGreaterThanOrEqual($expected, $actual, $message = '') @@ -690,6 +711,7 @@ public static function assertGreaterThanOrEqual($expected, $actual, $message = ' * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -707,6 +729,7 @@ public static function assertAttributeGreaterThanOrEqual($expected, $actualAttri * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertLessThan($expected, $actual, $message = '') @@ -721,6 +744,7 @@ public static function assertLessThan($expected, $actual, $message = '') * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -738,6 +762,7 @@ public static function assertAttributeLessThan($expected, $actualAttributeName, * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertLessThanOrEqual($expected, $actual, $message = '') @@ -752,6 +777,7 @@ public static function assertLessThanOrEqual($expected, $actual, $message = '') * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -772,6 +798,7 @@ public static function assertAttributeLessThanOrEqual($expected, $actualAttribut * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.2.14 */ public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false) @@ -799,6 +826,7 @@ public static function assertFileEquals($expected, $actual, $message = '', $cano * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.2.14 */ public static function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false) @@ -826,6 +854,7 @@ public static function assertFileNotEquals($expected, $actual, $message = '', $c * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.3.0 */ public static function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false) @@ -852,6 +881,7 @@ public static function assertStringEqualsFile($expectedFile, $actualString, $mes * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.3.0 */ public static function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false) @@ -874,6 +904,7 @@ public static function assertStringNotEqualsFile($expectedFile, $actualString, $ * * @param string $filename * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertFileExists($filename, $message = '') @@ -892,6 +923,7 @@ public static function assertFileExists($filename, $message = '') * * @param string $filename * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertFileNotExists($filename, $message = '') @@ -910,8 +942,9 @@ public static function assertFileNotExists($filename, $message = '') /** * Asserts that a condition is true. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function assertTrue($condition, $message = '') @@ -922,8 +955,9 @@ public static function assertTrue($condition, $message = '') /** * Asserts that a condition is not true. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function assertNotTrue($condition, $message = '') @@ -934,8 +968,9 @@ public static function assertNotTrue($condition, $message = '') /** * Asserts that a condition is false. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function assertFalse($condition, $message = '') @@ -946,8 +981,9 @@ public static function assertFalse($condition, $message = '') /** * Asserts that a condition is not false. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function assertNotFalse($condition, $message = '') @@ -983,6 +1019,7 @@ public static function assertNull($actual, $message = '') * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertClassHasAttribute($attributeName, $className, $message = '') @@ -1012,6 +1049,7 @@ public static function assertClassHasAttribute($attributeName, $className, $mess * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertClassNotHasAttribute($attributeName, $className, $message = '') @@ -1041,6 +1079,7 @@ public static function assertClassNotHasAttribute($attributeName, $className, $m * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertClassHasStaticAttribute($attributeName, $className, $message = '') @@ -1070,6 +1109,7 @@ public static function assertClassHasStaticAttribute($attributeName, $className, * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertClassNotHasStaticAttribute($attributeName, $className, $message = '') @@ -1101,6 +1141,7 @@ public static function assertClassNotHasStaticAttribute($attributeName, $classNa * @param string $attributeName * @param object $object * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertObjectHasAttribute($attributeName, $object, $message = '') @@ -1130,6 +1171,7 @@ public static function assertObjectHasAttribute($attributeName, $object, $messag * @param string $attributeName * @param object $object * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertObjectNotHasAttribute($attributeName, $object, $message = '') @@ -1239,6 +1281,7 @@ public static function assertAttributeNotSame($expected, $actualAttributeName, $ * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertInstanceOf($expected, $actual, $message = '') @@ -1261,6 +1304,7 @@ public static function assertInstanceOf($expected, $actual, $message = '') * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '') @@ -1278,6 +1322,7 @@ public static function assertAttributeInstanceOf($expected, $attributeName, $cla * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertNotInstanceOf($expected, $actual, $message = '') @@ -1300,6 +1345,7 @@ public static function assertNotInstanceOf($expected, $actual, $message = '') * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '') @@ -1317,6 +1363,7 @@ public static function assertAttributeNotInstanceOf($expected, $attributeName, $ * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertInternalType($expected, $actual, $message = '') @@ -1339,6 +1386,7 @@ public static function assertInternalType($expected, $actual, $message = '') * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '') @@ -1356,6 +1404,7 @@ public static function assertAttributeInternalType($expected, $attributeName, $c * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertNotInternalType($expected, $actual, $message = '') @@ -1378,6 +1427,7 @@ public static function assertNotInternalType($expected, $actual, $message = '') * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '') @@ -1417,6 +1467,7 @@ public static function assertRegExp($pattern, $string, $message = '') * @param string $pattern * @param string $string * @param string $message + * * @since Method available since Release 2.1.0 */ public static function assertNotRegExp($pattern, $string, $message = '') @@ -1500,6 +1551,7 @@ public static function assertNotSameSize($expected, $actual, $message = '') * @param string $format * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertStringMatchesFormat($format, $string, $message = '') @@ -1523,6 +1575,7 @@ public static function assertStringMatchesFormat($format, $string, $message = '' * @param string $format * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertStringNotMatchesFormat($format, $string, $message = '') @@ -1548,6 +1601,7 @@ public static function assertStringNotMatchesFormat($format, $string, $message = * @param string $formatFile * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertStringMatchesFormatFile($formatFile, $string, $message = '') @@ -1571,6 +1625,7 @@ public static function assertStringMatchesFormatFile($formatFile, $string, $mess * @param string $formatFile * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ public static function assertStringNotMatchesFormatFile($formatFile, $string, $message = '') @@ -1596,6 +1651,7 @@ public static function assertStringNotMatchesFormatFile($formatFile, $string, $m * @param string $prefix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ public static function assertStringStartsWith($prefix, $string, $message = '') @@ -1621,6 +1677,7 @@ public static function assertStringStartsWith($prefix, $string, $message = '') * @param string $prefix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ public static function assertStringStartsNotWith($prefix, $string, $message = '') @@ -1646,6 +1703,7 @@ public static function assertStringStartsNotWith($prefix, $string, $message = '' * @param string $suffix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ public static function assertStringEndsWith($suffix, $string, $message = '') @@ -1669,6 +1727,7 @@ public static function assertStringEndsWith($suffix, $string, $message = '') * @param string $suffix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ public static function assertStringEndsNotWith($suffix, $string, $message = '') @@ -1694,6 +1753,7 @@ public static function assertStringEndsNotWith($suffix, $string, $message = '') * @param string $expectedFile * @param string $actualFile * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '') @@ -1710,6 +1770,7 @@ public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $m * @param string $expectedFile * @param string $actualFile * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '') @@ -1726,6 +1787,7 @@ public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, * @param string $expectedFile * @param string $actualXml * @param string $message + * * @since Method available since Release 3.3.0 */ public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '') @@ -1742,6 +1804,7 @@ public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $ * @param string $expectedFile * @param string $actualXml * @param string $message + * * @since Method available since Release 3.3.0 */ public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '') @@ -1758,6 +1821,7 @@ public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml * @param string $expectedXml * @param string $actualXml * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '') @@ -1774,6 +1838,7 @@ public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml, * @param string $expectedXml * @param string $actualXml * @param string $message + * * @since Method available since Release 3.1.0 */ public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '') @@ -1791,15 +1856,16 @@ public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXm * @param DOMElement $actualElement * @param bool $checkAttributes * @param string $message + * * @since Method available since Release 3.3.0 */ public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '') { - $tmp = new DOMDocument; + $tmp = new DOMDocument; $expectedElement = $tmp->importNode($expectedElement, true); - $tmp = new DOMDocument; - $actualElement= $tmp->importNode($actualElement, true); + $tmp = new DOMDocument; + $actualElement = $tmp->importNode($actualElement, true); unset($tmp); @@ -1885,6 +1951,7 @@ public static function assertEqualXMLStructure(DOMElement $expectedElement, DOME * @param mixed $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 * @deprecated * @codeCoverageIgnore @@ -1913,6 +1980,7 @@ public static function assertSelectCount($selector, $count, $actual, $message = * @param mixed $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 * @deprecated * @codeCoverageIgnore @@ -1941,6 +2009,7 @@ public static function assertSelectRegExp($selector, $pattern, $count, $actual, * @param mixed $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 * @deprecated * @codeCoverageIgnore @@ -2128,6 +2197,7 @@ public static function assertSelectEquals($selector, $content, $count, $actual, * @param string $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 * @deprecated * @codeCoverageIgnore @@ -2153,6 +2223,7 @@ public static function assertTag($matcher, $actual, $message = '', $isHtml = tru * @param string $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 * @deprecated * @codeCoverageIgnore @@ -2174,6 +2245,7 @@ public static function assertNotTag($matcher, $actual, $message = '', $isHtml = * @param mixed $value * @param PHPUnit_Framework_Constraint $constraint * @param string $message + * * @since Method available since Release 3.0.0 */ public static function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '') @@ -2188,6 +2260,7 @@ public static function assertThat($value, PHPUnit_Framework_Constraint $constrai * * @param string $actualJson * @param string $message + * * @since Method available since Release 3.7.20 */ public static function assertJson($actualJson, $message = '') @@ -2343,6 +2416,7 @@ public static function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, * Returns a PHPUnit_Framework_Constraint_And matcher object. * * @return PHPUnit_Framework_Constraint_And + * * @since Method available since Release 3.0.0 */ public static function logicalAnd() @@ -2359,6 +2433,7 @@ public static function logicalAnd() * Returns a PHPUnit_Framework_Constraint_Or matcher object. * * @return PHPUnit_Framework_Constraint_Or + * * @since Method available since Release 3.0.0 */ public static function logicalOr() @@ -2374,8 +2449,10 @@ public static function logicalOr() /** * Returns a PHPUnit_Framework_Constraint_Not matcher object. * - * @param PHPUnit_Framework_Constraint $constraint + * @param PHPUnit_Framework_Constraint $constraint + * * @return PHPUnit_Framework_Constraint_Not + * * @since Method available since Release 3.0.0 */ public static function logicalNot(PHPUnit_Framework_Constraint $constraint) @@ -2387,6 +2464,7 @@ public static function logicalNot(PHPUnit_Framework_Constraint $constraint) * Returns a PHPUnit_Framework_Constraint_Xor matcher object. * * @return PHPUnit_Framework_Constraint_Xor + * * @since Method available since Release 3.0.0 */ public static function logicalXor() @@ -2403,6 +2481,7 @@ public static function logicalXor() * Returns a PHPUnit_Framework_Constraint_IsAnything matcher object. * * @return PHPUnit_Framework_Constraint_IsAnything + * * @since Method available since Release 3.0.0 */ public static function anything() @@ -2414,6 +2493,7 @@ public static function anything() * Returns a PHPUnit_Framework_Constraint_IsTrue matcher object. * * @return PHPUnit_Framework_Constraint_IsTrue + * * @since Method available since Release 3.3.0 */ public static function isTrue() @@ -2424,7 +2504,8 @@ public static function isTrue() /** * Returns a PHPUnit_Framework_Constraint_Callback matcher object. * - * @param callable $callback + * @param callable $callback + * * @return PHPUnit_Framework_Constraint_Callback */ public static function callback($callback) @@ -2436,6 +2517,7 @@ public static function callback($callback) * Returns a PHPUnit_Framework_Constraint_IsFalse matcher object. * * @return PHPUnit_Framework_Constraint_IsFalse + * * @since Method available since Release 3.3.0 */ public static function isFalse() @@ -2447,6 +2529,7 @@ public static function isFalse() * Returns a PHPUnit_Framework_Constraint_IsJson matcher object. * * @return PHPUnit_Framework_Constraint_IsJson + * * @since Method available since Release 3.7.20 */ public static function isJson() @@ -2458,6 +2541,7 @@ public static function isJson() * Returns a PHPUnit_Framework_Constraint_IsNull matcher object. * * @return PHPUnit_Framework_Constraint_IsNull + * * @since Method available since Release 3.3.0 */ public static function isNull() @@ -2468,9 +2552,11 @@ public static function isNull() /** * Returns a PHPUnit_Framework_Constraint_Attribute matcher object. * - * @param PHPUnit_Framework_Constraint $constraint - * @param string $attributeName + * @param PHPUnit_Framework_Constraint $constraint + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_Attribute + * * @since Method available since Release 3.1.0 */ public static function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName) @@ -2485,10 +2571,12 @@ public static function attribute(PHPUnit_Framework_Constraint $constraint, $attr * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher * object. * - * @param mixed $value - * @param bool $checkForObjectIdentity - * @param bool $checkForNonObjectIdentity + * @param mixed $value + * @param bool $checkForObjectIdentity + * @param bool $checkForNonObjectIdentity + * * @return PHPUnit_Framework_Constraint_TraversableContains + * * @since Method available since Release 3.0.0 */ public static function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -2500,8 +2588,10 @@ public static function contains($value, $checkForObjectIdentity = true, $checkFo * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher * object. * - * @param string $type + * @param string $type + * * @return PHPUnit_Framework_Constraint_TraversableContainsOnly + * * @since Method available since Release 3.1.4 */ public static function containsOnly($type) @@ -2513,7 +2603,8 @@ public static function containsOnly($type) * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher * object. * - * @param string $classname + * @param string $classname + * * @return PHPUnit_Framework_Constraint_TraversableContainsOnly */ public static function containsOnlyInstancesOf($classname) @@ -2524,8 +2615,10 @@ public static function containsOnlyInstancesOf($classname) /** * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object. * - * @param mixed $key + * @param mixed $key + * * @return PHPUnit_Framework_Constraint_ArrayHasKey + * * @since Method available since Release 3.0.0 */ public static function arrayHasKey($key) @@ -2536,12 +2629,14 @@ public static function arrayHasKey($key) /** * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object. * - * @param mixed $value - * @param float $delta - * @param int $maxDepth - * @param bool $canonicalize - * @param bool $ignoreCase + * @param mixed $value + * @param float $delta + * @param int $maxDepth + * @param bool $canonicalize + * @param bool $ignoreCase + * * @return PHPUnit_Framework_Constraint_IsEqual + * * @since Method available since Release 3.0.0 */ public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -2560,13 +2655,15 @@ public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicali * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher * object. * - * @param string $attributeName - * @param mixed $value - * @param float $delta - * @param int $maxDepth - * @param bool $canonicalize - * @param bool $ignoreCase + * @param string $attributeName + * @param mixed $value + * @param float $delta + * @param int $maxDepth + * @param bool $canonicalize + * @param bool $ignoreCase + * * @return PHPUnit_Framework_Constraint_Attribute + * * @since Method available since Release 3.1.0 */ public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -2587,6 +2684,7 @@ public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $m * Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object. * * @return PHPUnit_Framework_Constraint_IsEmpty + * * @since Method available since Release 3.5.0 */ public static function isEmpty() @@ -2598,6 +2696,7 @@ public static function isEmpty() * Returns a PHPUnit_Framework_Constraint_FileExists matcher object. * * @return PHPUnit_Framework_Constraint_FileExists + * * @since Method available since Release 3.0.0 */ public static function fileExists() @@ -2608,8 +2707,10 @@ public static function fileExists() /** * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_GreaterThan + * * @since Method available since Release 3.0.0 */ public static function greaterThan($value) @@ -2622,8 +2723,10 @@ public static function greaterThan($value) * a PHPUnit_Framework_Constraint_IsEqual and a * PHPUnit_Framework_Constraint_GreaterThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_Or + * * @since Method available since Release 3.1.0 */ public static function greaterThanOrEqual($value) @@ -2637,8 +2740,10 @@ public static function greaterThanOrEqual($value) /** * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object. * - * @param string $attributeName + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_ClassHasAttribute + * * @since Method available since Release 3.1.0 */ public static function classHasAttribute($attributeName) @@ -2652,8 +2757,10 @@ public static function classHasAttribute($attributeName) * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher * object. * - * @param string $attributeName + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute + * * @since Method available since Release 3.1.0 */ public static function classHasStaticAttribute($attributeName) @@ -2666,8 +2773,10 @@ public static function classHasStaticAttribute($attributeName) /** * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object. * - * @param string $attributeName + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_ObjectHasAttribute + * * @since Method available since Release 3.0.0 */ public static function objectHasAttribute($attributeName) @@ -2680,8 +2789,10 @@ public static function objectHasAttribute($attributeName) /** * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_IsIdentical + * * @since Method available since Release 3.0.0 */ public static function identicalTo($value) @@ -2692,8 +2803,10 @@ public static function identicalTo($value) /** * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object. * - * @param string $className + * @param string $className + * * @return PHPUnit_Framework_Constraint_IsInstanceOf + * * @since Method available since Release 3.0.0 */ public static function isInstanceOf($className) @@ -2704,8 +2817,10 @@ public static function isInstanceOf($className) /** * Returns a PHPUnit_Framework_Constraint_IsType matcher object. * - * @param string $type + * @param string $type + * * @return PHPUnit_Framework_Constraint_IsType + * * @since Method available since Release 3.0.0 */ public static function isType($type) @@ -2716,8 +2831,10 @@ public static function isType($type) /** * Returns a PHPUnit_Framework_Constraint_LessThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_LessThan + * * @since Method available since Release 3.0.0 */ public static function lessThan($value) @@ -2730,8 +2847,10 @@ public static function lessThan($value) * a PHPUnit_Framework_Constraint_IsEqual and a * PHPUnit_Framework_Constraint_LessThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_Or + * * @since Method available since Release 3.1.0 */ public static function lessThanOrEqual($value) @@ -2745,8 +2864,10 @@ public static function lessThanOrEqual($value) /** * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object. * - * @param string $pattern + * @param string $pattern + * * @return PHPUnit_Framework_Constraint_PCREMatch + * * @since Method available since Release 3.0.0 */ public static function matchesRegularExpression($pattern) @@ -2757,8 +2878,10 @@ public static function matchesRegularExpression($pattern) /** * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object. * - * @param string $string + * @param string $string + * * @return PHPUnit_Framework_Constraint_StringMatches + * * @since Method available since Release 3.5.0 */ public static function matches($string) @@ -2769,8 +2892,10 @@ public static function matches($string) /** * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object. * - * @param mixed $prefix + * @param mixed $prefix + * * @return PHPUnit_Framework_Constraint_StringStartsWith + * * @since Method available since Release 3.4.0 */ public static function stringStartsWith($prefix) @@ -2781,9 +2906,11 @@ public static function stringStartsWith($prefix) /** * Returns a PHPUnit_Framework_Constraint_StringContains matcher object. * - * @param string $string - * @param bool $case + * @param string $string + * @param bool $case + * * @return PHPUnit_Framework_Constraint_StringContains + * * @since Method available since Release 3.0.0 */ public static function stringContains($string, $case = true) @@ -2794,8 +2921,10 @@ public static function stringContains($string, $case = true) /** * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object. * - * @param mixed $suffix + * @param mixed $suffix + * * @return PHPUnit_Framework_Constraint_StringEndsWith + * * @since Method available since Release 3.4.0 */ public static function stringEndsWith($suffix) @@ -2806,7 +2935,8 @@ public static function stringEndsWith($suffix) /** * Returns a PHPUnit_Framework_Constraint_Count matcher object. * - * @param int $count + * @param int $count + * * @return PHPUnit_Framework_Constraint_Count */ public static function countOf($count) @@ -2816,7 +2946,8 @@ public static function countOf($count) /** * Fails a test with the given message. * - * @param string $message + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ public static function fail($message = '') @@ -2828,9 +2959,11 @@ public static function fail($message = '') * Returns the value of an attribute of a class or an object. * This also works for attributes that are declared protected or private. * - * @param mixed $classOrObject - * @param string $attributeName + * @param mixed $classOrObject + * @param string $attributeName + * * @return mixed + * * @throws PHPUnit_Framework_Exception */ public static function readAttribute($classOrObject, $attributeName) @@ -2872,10 +3005,13 @@ public static function readAttribute($classOrObject, $attributeName) * Returns the value of a static attribute. * This also works for attributes that are declared protected or private. * - * @param string $className - * @param string $attributeName + * @param string $className + * @param string $attributeName + * * @return mixed + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.0.0 */ public static function getStaticAttribute($className, $attributeName) @@ -2920,10 +3056,13 @@ public static function getStaticAttribute($className, $attributeName) * Returns the value of an object's attribute. * This also works for attributes that are declared protected or private. * - * @param object $object - * @param string $attributeName + * @param object $object + * @param string $attributeName + * * @return mixed + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.0.0 */ public static function getObjectAttribute($object, $attributeName) @@ -2977,8 +3116,10 @@ public static function getObjectAttribute($object, $attributeName) /** * Mark the test as incomplete. * - * @param string $message + * @param string $message + * * @throws PHPUnit_Framework_IncompleteTestError + * * @since Method available since Release 3.0.0 */ public static function markTestIncomplete($message = '') @@ -2989,8 +3130,10 @@ public static function markTestIncomplete($message = '') /** * Mark the test as skipped. * - * @param string $message + * @param string $message + * * @throws PHPUnit_Framework_SkippedTestError + * * @since Method available since Release 3.0.0 */ public static function markTestSkipped($message = '') @@ -3002,6 +3145,7 @@ public static function markTestSkipped($message = '') * Return the current assertion count. * * @return int + * * @since Method available since Release 3.3.3 */ public static function getCount() diff --git a/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php b/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php index 1f49e5d..d19b574 100644 --- a/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php +++ b/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php @@ -13,6 +13,7 @@ * zero or more times. * * @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount + * * @since Method available since Release 3.0.0 */ function any() @@ -27,6 +28,7 @@ function any() * Returns a PHPUnit_Framework_Constraint_IsAnything matcher object. * * @return PHPUnit_Framework_Constraint_IsAnything + * * @since Method available since Release 3.0.0 */ function anything() @@ -40,8 +42,10 @@ function anything() /** * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object. * - * @param mixed $key + * @param mixed $key + * * @return PHPUnit_Framework_Constraint_ArrayHasKey + * * @since Method available since Release 3.0.0 */ function arrayHasKey($key) @@ -58,6 +62,7 @@ function arrayHasKey($key) * @param mixed $key * @param array|ArrayAccess $array * @param string $message + * * @since Method available since Release 3.0.0 */ function assertArrayHasKey($key, $array, $message = '') @@ -75,6 +80,7 @@ function assertArrayHasKey($key, $array, $message = '') * @param array|ArrayAccess $array * @param bool $strict Check for object identity * @param string $message + * * @since Method available since Release 4.4.0 */ function assertArraySubset($subset, $array, $strict = false, $message = '') @@ -91,6 +97,7 @@ function assertArraySubset($subset, $array, $strict = false, $message = '') * @param mixed $key * @param array|ArrayAccess $array * @param string $message + * * @since Method available since Release 3.0.0 */ function assertArrayNotHasKey($key, $array, $message = '') @@ -112,6 +119,7 @@ function assertArrayNotHasKey($key, $array, $message = '') * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 3.0.0 */ function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -131,6 +139,7 @@ function assertAttributeContains($needle, $haystackAttributeName, $haystackClass * @param mixed $haystackClassOrObject * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') @@ -149,6 +158,7 @@ function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackCla * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.6.0 */ function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') @@ -166,6 +176,7 @@ function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackC * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') @@ -203,6 +214,7 @@ function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrOb * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -220,6 +232,7 @@ function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClas * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -237,6 +250,7 @@ function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $act * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '') @@ -254,6 +268,7 @@ function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $m * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '') @@ -271,6 +286,7 @@ function assertAttributeInternalType($expected, $attributeName, $classOrObject, * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -288,6 +304,7 @@ function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOr * @param string $actualAttributeName * @param string $actualClassOrObject * @param string $message + * * @since Method available since Release 3.1.0 */ function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') @@ -309,6 +326,7 @@ function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actual * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 3.0.0 */ function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -329,6 +347,7 @@ function assertAttributeNotContains($needle, $haystackAttributeName, $haystackCl * @param mixed $haystackClassOrObject * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') @@ -347,6 +366,7 @@ function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystack * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.6.0 */ function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') @@ -364,6 +384,7 @@ function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haysta * @param string $haystackAttributeName * @param mixed $haystackClassOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') @@ -401,6 +422,7 @@ function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassO * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '') @@ -418,6 +440,7 @@ function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, * @param string $attributeName * @param mixed $classOrObject * @param string $message + * * @since Method available since Release 3.5.0 */ function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '') @@ -468,6 +491,7 @@ function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObje * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ function assertClassHasAttribute($attributeName, $className, $message = '') @@ -484,6 +508,7 @@ function assertClassHasAttribute($attributeName, $className, $message = '') * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ function assertClassHasStaticAttribute($attributeName, $className, $message = '') @@ -500,6 +525,7 @@ function assertClassHasStaticAttribute($attributeName, $className, $message = '' * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ function assertClassNotHasAttribute($attributeName, $className, $message = '') @@ -516,6 +542,7 @@ function assertClassNotHasAttribute($attributeName, $className, $message = '') * @param string $attributeName * @param string $className * @param string $message + * * @since Method available since Release 3.1.0 */ function assertClassNotHasStaticAttribute($attributeName, $className, $message = '') @@ -535,6 +562,7 @@ function assertClassNotHasStaticAttribute($attributeName, $className, $message = * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 2.1.0 */ function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -552,6 +580,7 @@ function assertContains($needle, $haystack, $message = '', $ignoreCase = false, * @param mixed $haystack * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '') @@ -595,8 +624,9 @@ function assertCount($expectedCount, $haystack, $message = '') /** * Asserts that a variable is empty. * - * @param mixed $actual - * @param string $message + * @param mixed $actual + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ function assertEmpty($actual, $message = '') @@ -614,6 +644,7 @@ function assertEmpty($actual, $message = '') * @param DOMElement $actualElement * @param bool $checkAttributes * @param string $message + * * @since Method available since Release 3.3.0 */ function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '') @@ -646,8 +677,9 @@ function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth /** * Asserts that a condition is not true. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ function assertNotTrue($condition, $message = '') @@ -661,8 +693,9 @@ function assertNotTrue($condition, $message = '') /** * Asserts that a condition is false. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ function assertFalse($condition, $message = '') @@ -682,6 +715,7 @@ function assertFalse($condition, $message = '') * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.2.14 */ function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false) @@ -697,6 +731,7 @@ function assertFileEquals($expected, $actual, $message = '', $canonicalize = fal * * @param string $filename * @param string $message + * * @since Method available since Release 3.0.0 */ function assertFileExists($filename, $message = '') @@ -716,6 +751,7 @@ function assertFileExists($filename, $message = '') * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.2.14 */ function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false) @@ -731,6 +767,7 @@ function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = * * @param string $filename * @param string $message + * * @since Method available since Release 3.0.0 */ function assertFileNotExists($filename, $message = '') @@ -747,6 +784,7 @@ function assertFileNotExists($filename, $message = '') * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ function assertGreaterThan($expected, $actual, $message = '') @@ -763,6 +801,7 @@ function assertGreaterThan($expected, $actual, $message = '') * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ function assertGreaterThanOrEqual($expected, $actual, $message = '') @@ -779,6 +818,7 @@ function assertGreaterThanOrEqual($expected, $actual, $message = '') * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ function assertInstanceOf($expected, $actual, $message = '') @@ -795,6 +835,7 @@ function assertInstanceOf($expected, $actual, $message = '') * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ function assertInternalType($expected, $actual, $message = '') @@ -810,6 +851,7 @@ function assertInternalType($expected, $actual, $message = '') * * @param string $actualJson * @param string $message + * * @since Method available since Release 3.7.20 */ function assertJson($actualJson, $message = '') @@ -916,6 +958,7 @@ function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $messag * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ function assertLessThan($expected, $actual, $message = '') @@ -932,6 +975,7 @@ function assertLessThan($expected, $actual, $message = '') * @param mixed $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.1.0 */ function assertLessThanOrEqual($expected, $actual, $message = '') @@ -951,6 +995,7 @@ function assertLessThanOrEqual($expected, $actual, $message = '') * @param bool $ignoreCase * @param bool $checkForObjectIdentity * @param bool $checkForNonObjectIdentity + * * @since Method available since Release 2.1.0 */ function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -968,6 +1013,7 @@ function assertNotContains($needle, $haystack, $message = '', $ignoreCase = fals * @param mixed $haystack * @param bool $isNativeType * @param string $message + * * @since Method available since Release 3.1.4 */ function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '') @@ -996,8 +1042,9 @@ function assertNotCount($expectedCount, $haystack, $message = '') /** * Asserts that a variable is not empty. * - * @param mixed $actual - * @param string $message + * @param mixed $actual + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ function assertNotEmpty($actual, $message = '') @@ -1018,6 +1065,7 @@ function assertNotEmpty($actual, $message = '') * @param int $maxDepth * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 2.3.0 */ function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -1034,6 +1082,7 @@ function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDe * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ function assertNotInstanceOf($expected, $actual, $message = '') @@ -1050,6 +1099,7 @@ function assertNotInstanceOf($expected, $actual, $message = '') * @param string $expected * @param mixed $actual * @param string $message + * * @since Method available since Release 3.5.0 */ function assertNotInternalType($expected, $actual, $message = '') @@ -1063,8 +1113,9 @@ function assertNotInternalType($expected, $actual, $message = '') /** * Asserts that a condition is not false. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ function assertNotFalse($condition, $message = '') @@ -1095,6 +1146,7 @@ function assertNotNull($actual, $message = '') * @param string $pattern * @param string $string * @param string $message + * * @since Method available since Release 2.1.0 */ function assertNotRegExp($pattern, $string, $message = '') @@ -1148,6 +1200,7 @@ function assertNotSameSize($expected, $actual, $message = '') * @param string $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 */ function assertNotTag($matcher, $actual, $message = '', $isHtml = true) @@ -1178,6 +1231,7 @@ function assertNull($actual, $message = '') * @param string $attributeName * @param object $object * @param string $message + * * @since Method available since Release 3.0.0 */ function assertObjectHasAttribute($attributeName, $object, $message = '') @@ -1194,6 +1248,7 @@ function assertObjectHasAttribute($attributeName, $object, $message = '') * @param string $attributeName * @param object $object * @param string $message + * * @since Method available since Release 3.0.0 */ function assertObjectNotHasAttribute($attributeName, $object, $message = '') @@ -1272,6 +1327,7 @@ function assertSameSize($expected, $actual, $message = '') * @param mixed $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 */ function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true) @@ -1292,6 +1348,7 @@ function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = * @param mixed $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 */ function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true) @@ -1312,6 +1369,7 @@ function assertSelectEquals($selector, $content, $count, $actual, $message = '', * @param mixed $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 */ function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true) @@ -1328,6 +1386,7 @@ function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', * @param string $suffix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ function assertStringEndsNotWith($suffix, $string, $message = '') @@ -1344,6 +1403,7 @@ function assertStringEndsNotWith($suffix, $string, $message = '') * @param string $suffix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ function assertStringEndsWith($suffix, $string, $message = '') @@ -1363,6 +1423,7 @@ function assertStringEndsWith($suffix, $string, $message = '') * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.3.0 */ function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false) @@ -1379,6 +1440,7 @@ function assertStringEqualsFile($expectedFile, $actualString, $message = '', $ca * @param string $format * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ function assertStringMatchesFormat($format, $string, $message = '') @@ -1395,6 +1457,7 @@ function assertStringMatchesFormat($format, $string, $message = '') * @param string $formatFile * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ function assertStringMatchesFormatFile($formatFile, $string, $message = '') @@ -1414,6 +1477,7 @@ function assertStringMatchesFormatFile($formatFile, $string, $message = '') * @param string $message * @param bool $canonicalize * @param bool $ignoreCase + * * @since Method available since Release 3.3.0 */ function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false) @@ -1430,6 +1494,7 @@ function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', * @param string $format * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ function assertStringNotMatchesFormat($format, $string, $message = '') @@ -1446,6 +1511,7 @@ function assertStringNotMatchesFormat($format, $string, $message = '') * @param string $formatFile * @param string $string * @param string $message + * * @since Method available since Release 3.5.0 */ function assertStringNotMatchesFormatFile($formatFile, $string, $message = '') @@ -1462,6 +1528,7 @@ function assertStringNotMatchesFormatFile($formatFile, $string, $message = '') * @param string $prefix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ function assertStringStartsNotWith($prefix, $string, $message = '') @@ -1478,6 +1545,7 @@ function assertStringStartsNotWith($prefix, $string, $message = '') * @param string $prefix * @param string $string * @param string $message + * * @since Method available since Release 3.4.0 */ function assertStringStartsWith($prefix, $string, $message = '') @@ -1621,6 +1689,7 @@ function assertStringStartsWith($prefix, $string, $message = '') * @param string $actual * @param string $message * @param bool $isHtml + * * @since Method available since Release 3.3.0 */ function assertTag($matcher, $actual, $message = '', $isHtml = true) @@ -1637,6 +1706,7 @@ function assertTag($matcher, $actual, $message = '', $isHtml = true) * @param mixed$value * @param PHPUnit_Framework_Constraint $constraint * @param string $message + * * @since Method available since Release 3.0.0 */ function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '') @@ -1650,8 +1720,9 @@ function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = /** * Asserts that a condition is true. * - * @param bool $condition - * @param string $message + * @param bool $condition + * @param string $message + * * @throws PHPUnit_Framework_AssertionFailedError */ function assertTrue($condition, $message = '') @@ -1668,6 +1739,7 @@ function assertTrue($condition, $message = '') * @param string $expectedFile * @param string $actualFile * @param string $message + * * @since Method available since Release 3.1.0 */ function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '') @@ -1684,6 +1756,7 @@ function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '') * @param string $expectedFile * @param string $actualFile * @param string $message + * * @since Method available since Release 3.1.0 */ function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '') @@ -1700,6 +1773,7 @@ function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '' * @param string $expectedFile * @param string $actualXml * @param string $message + * * @since Method available since Release 3.3.0 */ function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '') @@ -1716,6 +1790,7 @@ function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '') * @param string $expectedXml * @param string $actualXml * @param string $message + * * @since Method available since Release 3.1.0 */ function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '') @@ -1732,6 +1807,7 @@ function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '') * @param string $expectedFile * @param string $actualXml * @param string $message + * * @since Method available since Release 3.3.0 */ function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '') @@ -1748,6 +1824,7 @@ function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = ' * @param string $expectedXml * @param string $actualXml * @param string $message + * * @since Method available since Release 3.1.0 */ function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '') @@ -1762,8 +1839,10 @@ function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = * Returns a matcher that matches when the method is executed * at the given $index. * - * @param int $index + * @param int $index + * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex + * * @since Method available since Release 3.0.0 */ function at($index) @@ -1778,6 +1857,7 @@ function at($index) * Returns a matcher that matches when the method is executed at least once. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce + * * @since Method available since Release 3.0.0 */ function atLeastOnce() @@ -1791,9 +1871,11 @@ function atLeastOnce() /** * Returns a PHPUnit_Framework_Constraint_Attribute matcher object. * - * @param PHPUnit_Framework_Constraint $constraint - * @param string $attributeName + * @param PHPUnit_Framework_Constraint $constraint + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_Attribute + * * @since Method available since Release 3.1.0 */ function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName) @@ -1809,13 +1891,15 @@ function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName) * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher * object. * - * @param string $attributeName - * @param mixed $value - * @param float $delta - * @param int $maxDepth - * @param bool $canonicalize - * @param bool $ignoreCase + * @param string $attributeName + * @param mixed $value + * @param float $delta + * @param int $maxDepth + * @param bool $canonicalize + * @param bool $ignoreCase + * * @return PHPUnit_Framework_Constraint_Attribute + * * @since Method available since Release 3.1.0 */ function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -1829,7 +1913,8 @@ function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, /** * Returns a PHPUnit_Framework_Constraint_Callback matcher object. * - * @param callable $callback + * @param callable $callback + * * @return PHPUnit_Framework_Constraint_Callback */ function callback($callback) @@ -1843,8 +1928,10 @@ function callback($callback) /** * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object. * - * @param string $attributeName + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_ClassHasAttribute + * * @since Method available since Release 3.1.0 */ function classHasAttribute($attributeName) @@ -1859,8 +1946,10 @@ function classHasAttribute($attributeName) * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher * object. * - * @param string $attributeName + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute + * * @since Method available since Release 3.1.0 */ function classHasStaticAttribute($attributeName) @@ -1875,10 +1964,12 @@ function classHasStaticAttribute($attributeName) * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher * object. * - * @param mixed $value - * @param bool $checkForObjectIdentity - * @param bool $checkForNonObjectIdentity + * @param mixed $value + * @param bool $checkForObjectIdentity + * @param bool $checkForNonObjectIdentity + * * @return PHPUnit_Framework_Constraint_TraversableContains + * * @since Method available since Release 3.0.0 */ function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -1893,8 +1984,10 @@ function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIden * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher * object. * - * @param string $type + * @param string $type + * * @return PHPUnit_Framework_Constraint_TraversableContainsOnly + * * @since Method available since Release 3.1.4 */ function containsOnly($type) @@ -1909,7 +2002,8 @@ function containsOnly($type) * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher * object. * - * @param string $classname + * @param string $classname + * * @return PHPUnit_Framework_Constraint_TraversableContainsOnly */ function containsOnlyInstancesOf($classname) @@ -1923,12 +2017,14 @@ function containsOnlyInstancesOf($classname) /** * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object. * - * @param mixed $value - * @param float $delta - * @param int $maxDepth - * @param bool $canonicalize - * @param bool $ignoreCase + * @param mixed $value + * @param float $delta + * @param int $maxDepth + * @param bool $canonicalize + * @param bool $ignoreCase + * * @return PHPUnit_Framework_Constraint_IsEqual + * * @since Method available since Release 3.0.0 */ function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -1943,8 +2039,10 @@ function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $i * Returns a matcher that matches when the method is executed * exactly $count times. * - * @param int $count + * @param int $count + * * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount + * * @since Method available since Release 3.0.0 */ function exactly($count) @@ -1959,6 +2057,7 @@ function exactly($count) * Returns a PHPUnit_Framework_Constraint_FileExists matcher object. * * @return PHPUnit_Framework_Constraint_FileExists + * * @since Method available since Release 3.0.0 */ function fileExists() @@ -1972,8 +2071,10 @@ function fileExists() /** * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_GreaterThan + * * @since Method available since Release 3.0.0 */ function greaterThan($value) @@ -1989,8 +2090,10 @@ function greaterThan($value) * a PHPUnit_Framework_Constraint_IsEqual and a * PHPUnit_Framework_Constraint_GreaterThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_Or + * * @since Method available since Release 3.1.0 */ function greaterThanOrEqual($value) @@ -2004,8 +2107,10 @@ function greaterThanOrEqual($value) /** * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_IsIdentical + * * @since Method available since Release 3.0.0 */ function identicalTo($value) @@ -2020,6 +2125,7 @@ function identicalTo($value) * Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object. * * @return PHPUnit_Framework_Constraint_IsEmpty + * * @since Method available since Release 3.5.0 */ function isEmpty() @@ -2034,6 +2140,7 @@ function isEmpty() * Returns a PHPUnit_Framework_Constraint_IsFalse matcher object. * * @return PHPUnit_Framework_Constraint_IsFalse + * * @since Method available since Release 3.3.0 */ function isFalse() @@ -2047,8 +2154,10 @@ function isFalse() /** * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object. * - * @param string $className + * @param string $className + * * @return PHPUnit_Framework_Constraint_IsInstanceOf + * * @since Method available since Release 3.0.0 */ function isInstanceOf($className) @@ -2063,6 +2172,7 @@ function isInstanceOf($className) * Returns a PHPUnit_Framework_Constraint_IsJson matcher object. * * @return PHPUnit_Framework_Constraint_IsJson + * * @since Method available since Release 3.7.20 */ function isJson() @@ -2077,6 +2187,7 @@ function isJson() * Returns a PHPUnit_Framework_Constraint_IsNull matcher object. * * @return PHPUnit_Framework_Constraint_IsNull + * * @since Method available since Release 3.3.0 */ function isNull() @@ -2091,6 +2202,7 @@ function isNull() * Returns a PHPUnit_Framework_Constraint_IsTrue matcher object. * * @return PHPUnit_Framework_Constraint_IsTrue + * * @since Method available since Release 3.3.0 */ function isTrue() @@ -2104,8 +2216,10 @@ function isTrue() /** * Returns a PHPUnit_Framework_Constraint_IsType matcher object. * - * @param string $type + * @param string $type + * * @return PHPUnit_Framework_Constraint_IsType + * * @since Method available since Release 3.0.0 */ function isType($type) @@ -2119,8 +2233,10 @@ function isType($type) /** * Returns a PHPUnit_Framework_Constraint_LessThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_LessThan + * * @since Method available since Release 3.0.0 */ function lessThan($value) @@ -2136,8 +2252,10 @@ function lessThan($value) * a PHPUnit_Framework_Constraint_IsEqual and a * PHPUnit_Framework_Constraint_LessThan matcher object. * - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_Constraint_Or + * * @since Method available since Release 3.1.0 */ function lessThanOrEqual($value) @@ -2152,6 +2270,7 @@ function lessThanOrEqual($value) * Returns a PHPUnit_Framework_Constraint_And matcher object. * * @return PHPUnit_Framework_Constraint_And + * * @since Method available since Release 3.0.0 */ function logicalAnd() @@ -2165,8 +2284,10 @@ function logicalAnd() /** * Returns a PHPUnit_Framework_Constraint_Not matcher object. * - * @param PHPUnit_Framework_Constraint $constraint + * @param PHPUnit_Framework_Constraint $constraint + * * @return PHPUnit_Framework_Constraint_Not + * * @since Method available since Release 3.0.0 */ function logicalNot(PHPUnit_Framework_Constraint $constraint) @@ -2181,6 +2302,7 @@ function logicalNot(PHPUnit_Framework_Constraint $constraint) * Returns a PHPUnit_Framework_Constraint_Or matcher object. * * @return PHPUnit_Framework_Constraint_Or + * * @since Method available since Release 3.0.0 */ function logicalOr() @@ -2195,6 +2317,7 @@ function logicalOr() * Returns a PHPUnit_Framework_Constraint_Xor matcher object. * * @return PHPUnit_Framework_Constraint_Xor + * * @since Method available since Release 3.0.0 */ function logicalXor() @@ -2208,8 +2331,10 @@ function logicalXor() /** * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object. * - * @param string $string + * @param string $string + * * @return PHPUnit_Framework_Constraint_StringMatches + * * @since Method available since Release 3.5.0 */ function matches($string) @@ -2223,8 +2348,10 @@ function matches($string) /** * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object. * - * @param string $pattern + * @param string $pattern + * * @return PHPUnit_Framework_Constraint_PCREMatch + * * @since Method available since Release 3.0.0 */ function matchesRegularExpression($pattern) @@ -2239,6 +2366,7 @@ function matchesRegularExpression($pattern) * Returns a matcher that matches when the method is never executed. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount + * * @since Method available since Release 3.0.0 */ function never() @@ -2252,8 +2380,10 @@ function never() /** * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object. * - * @param string $attributeName + * @param string $attributeName + * * @return PHPUnit_Framework_Constraint_ObjectHasAttribute + * * @since Method available since Release 3.0.0 */ function objectHasAttribute($attributeName) @@ -2265,8 +2395,10 @@ function objectHasAttribute($attributeName) } /** - * @param mixed $value, ... + * @param mixed $value, ... + * * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls + * * @since Method available since Release 3.0.0 */ function onConsecutiveCalls() @@ -2281,6 +2413,7 @@ function onConsecutiveCalls() * Returns a matcher that matches when the method is executed exactly once. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount + * * @since Method available since Release 3.0.0 */ function once() @@ -2292,8 +2425,10 @@ function once() } /** - * @param int $argumentIndex + * @param int $argumentIndex + * * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument + * * @since Method available since Release 3.3.0 */ function returnArgument($argumentIndex) @@ -2305,8 +2440,10 @@ function returnArgument($argumentIndex) } /** - * @param mixed $callback + * @param mixed $callback + * * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback + * * @since Method available since Release 3.3.0 */ function returnCallback($callback) @@ -2323,6 +2460,7 @@ function returnCallback($callback) * This method is useful when mocking a fluent interface. * * @return PHPUnit_Framework_MockObject_Stub_ReturnSelf + * * @since Method available since Release 3.6.0 */ function returnSelf() @@ -2334,8 +2472,10 @@ function returnSelf() } /** - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_MockObject_Stub_Return + * * @since Method available since Release 3.0.0 */ function returnValue($value) @@ -2347,8 +2487,10 @@ function returnValue($value) } /** - * @param array $valueMap + * @param array $valueMap + * * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap + * * @since Method available since Release 3.6.0 */ function returnValueMap(array $valueMap) @@ -2362,9 +2504,11 @@ function returnValueMap(array $valueMap) /** * Returns a PHPUnit_Framework_Constraint_StringContains matcher object. * - * @param string $string - * @param bool $case + * @param string $string + * @param bool $case + * * @return PHPUnit_Framework_Constraint_StringContains + * * @since Method available since Release 3.0.0 */ function stringContains($string, $case = true) @@ -2378,8 +2522,10 @@ function stringContains($string, $case = true) /** * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object. * - * @param mixed $suffix + * @param mixed $suffix + * * @return PHPUnit_Framework_Constraint_StringEndsWith + * * @since Method available since Release 3.4.0 */ function stringEndsWith($suffix) @@ -2393,8 +2539,10 @@ function stringEndsWith($suffix) /** * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object. * - * @param mixed $prefix + * @param mixed $prefix + * * @return PHPUnit_Framework_Constraint_StringStartsWith + * * @since Method available since Release 3.4.0 */ function stringStartsWith($prefix) @@ -2406,8 +2554,10 @@ function stringStartsWith($prefix) } /** - * @param Exception $exception + * @param Exception $exception + * * @return PHPUnit_Framework_MockObject_Stub_Exception + * * @since Method available since Release 3.1.0 */ function throwException(Exception $exception) diff --git a/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php b/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php index bf8d062..c6e5d77 100644 --- a/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php +++ b/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php @@ -11,8 +11,8 @@ /** * An empty Listener that can be extended to implement TestListener * with just a few lines of code. - * @see PHPUnit_Framework_TestListener for documentation on the API methods. * + * @see PHPUnit_Framework_TestListener for documentation on the API methods. * @since Class available since Release 4.0.0 */ abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint.php b/vendor/phpunit/phpunit/src/Framework/Constraint.php index 327e1a9..43f8b2b 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint.php @@ -34,10 +34,12 @@ public function __construct() * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -63,7 +65,8 @@ public function evaluate($other, $description = '', $returnResult = false) * * This method can be overridden to implement the evaluation algorithm. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -75,6 +78,7 @@ protected function matches($other) * Counts the number of constraint elements. * * @return int + * * @since Method available since Release 3.4.0 */ public function count() @@ -85,9 +89,10 @@ public function count() /** * Throws an exception for the given compared value and test description * - * @param mixed $other Evaluated value or object. - * @param string $description Additional information about the test - * @param SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure + * @param mixed $other Evaluated value or object. + * @param string $description Additional information about the test + * @param SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure + * * @throws PHPUnit_Framework_ExpectationFailedException */ protected function fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null) @@ -119,7 +124,8 @@ protected function fail($other, $description, SebastianBergmann\Comparator\Compa * The function can be overridden to provide additional failure * information like a diff * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function additionalFailureDescription($other) @@ -136,7 +142,8 @@ protected function additionalFailureDescription($other) * To provide additional failure information additionalFailureDescription * can be used. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/And.php b/vendor/phpunit/phpunit/src/Framework/Constraint/And.php index fa38aa5..e4fa32f 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/And.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/And.php @@ -26,7 +26,8 @@ class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint protected $lastConstraint = null; /** - * @param PHPUnit_Framework_Constraint[] $constraints + * @param PHPUnit_Framework_Constraint[] $constraints + * * @throws PHPUnit_Framework_Exception */ public function setConstraints(array $constraints) @@ -55,10 +56,12 @@ public function setConstraints(array $constraints) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -106,6 +109,7 @@ public function toString() * Counts the number of constraint elements. * * @return int + * * @since Method available since Release 3.4.0 */ public function count() diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php index 84da6fb..f208b70 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php @@ -38,7 +38,8 @@ public function __construct($key) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -70,7 +71,8 @@ public function toString() * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php index 35dbd30..c3cb095 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php @@ -43,7 +43,8 @@ public function __construct($subset, $strict = false) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param array|ArrayAccess $other Array or ArrayAccess object to evaluate. + * @param array|ArrayAccess $other Array or ArrayAccess object to evaluate. + * * @return bool */ protected function matches($other) @@ -73,7 +74,8 @@ public function toString() * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php index 1252665..5a0c458 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php @@ -39,10 +39,12 @@ public function __construct(PHPUnit_Framework_Constraint $constraint, $attribute * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -74,7 +76,8 @@ public function toString() * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php index 280d6b1..df60d68 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php @@ -16,7 +16,8 @@ class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint private $callback; /** - * @param callable $callback + * @param callable $callback + * * @throws PHPUnit_Framework_Exception */ public function __construct($callback) @@ -37,7 +38,8 @@ public function __construct($callback) * Evaluates the constraint for parameter $value. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php index 53007a0..97315c9 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php @@ -36,7 +36,8 @@ public function __construct($attributeName) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -65,7 +66,8 @@ public function toString() * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php index b8c7c18..7bc29f1 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php @@ -22,7 +22,8 @@ class PHPUnit_Framework_Constraint_ClassHasStaticAttribute extends PHPUnit_Frame * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -42,6 +43,7 @@ protected function matches($other) * Returns a string representation of the constraint. * * @return string + * * @since Method available since Release 3.3.0 */ public function toString() diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php index 0da9431..680b832 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php @@ -37,10 +37,12 @@ public function __construct(PHPUnit_Framework_Constraint $innerConstraint) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php index a388da9..ee370ea 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php @@ -31,7 +31,8 @@ public function __construct($expected) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other + * @param mixed $other + * * @return bool */ protected function matches($other) @@ -40,7 +41,8 @@ protected function matches($other) } /** - * @param mixed $other + * @param mixed $other + * * @return bool */ protected function getCountOf($other) @@ -76,7 +78,8 @@ protected function getCountOf($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php index ab3c136..c05f172 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php @@ -31,7 +31,8 @@ public function __construct($className) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -45,7 +46,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php index 100d5f5..8f402fc 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php @@ -31,7 +31,8 @@ public function __construct($expected) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param Exception $other + * @param Exception $other + * * @return bool */ protected function matches($other) @@ -45,7 +46,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php index c6d955c..c9632e9 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php @@ -31,7 +31,8 @@ public function __construct($expected) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param Exception $other + * @param Exception $other + * * @return bool */ protected function matches($other) @@ -45,7 +46,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php index 34b15f4..7f2283a 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php @@ -31,7 +31,8 @@ public function __construct($expected) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param Exception $other + * @param Exception $other + * * @return bool */ protected function matches($other) @@ -53,7 +54,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php b/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php index 58d2a18..25643bd 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php @@ -21,7 +21,8 @@ class PHPUnit_Framework_Constraint_FileExists extends PHPUnit_Framework_Constrai * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -35,7 +36,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php b/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php index 557df5d..b67eae4 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php @@ -34,7 +34,8 @@ public function __construct($value) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php index e624abb..bfaa201 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php @@ -25,10 +25,12 @@ class PHPUnit_Framework_Constraint_IsAnything extends PHPUnit_Framework_Constrai * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -50,6 +52,7 @@ public function toString() * Counts the number of constraint elements. * * @return int + * * @since Method available since Release 3.5.0 */ public function count() diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php index f0323a6..e490669 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php @@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsEmpty extends PHPUnit_Framework_Constraint * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -47,7 +48,8 @@ public function toString() * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php index 2cf9c69..da5348d 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php @@ -52,11 +52,12 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint protected $lastFailure; /** - * @param mixed $value - * @param float $delta - * @param int $maxDepth - * @param bool $canonicalize - * @param bool $ignoreCase + * @param mixed $value + * @param float $delta + * @param int $maxDepth + * @param bool $canonicalize + * @param bool $ignoreCase + * * @throws PHPUnit_Framework_Exception */ public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) @@ -96,10 +97,12 @@ public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php index 9dee329..d476b09 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php @@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsFalse extends PHPUnit_Framework_Constraint * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php index 981f36c..9d8b5a1 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php @@ -52,10 +52,12 @@ public function __construct($value) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -95,7 +97,8 @@ public function evaluate($other, $description = '', $returnResult = false) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php index 3c70cc5..69a7a78 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php @@ -36,7 +36,8 @@ public function __construct($className) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -50,7 +51,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php index 34cda56..f6951ba 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php @@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsJson extends PHPUnit_Framework_Constraint * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -38,7 +39,8 @@ protected function matches($other) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php index dd300c2..d3b23a6 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php @@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsNull extends PHPUnit_Framework_Constraint * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php index 273adf4..6acddbb 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php @@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsTrue extends PHPUnit_Framework_Constraint * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php index b93b336..7f0499b 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php @@ -57,7 +57,8 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint protected $type; /** - * @param string $type + * @param string $type + * * @throws PHPUnit_Framework_Exception */ public function __construct($type) @@ -81,7 +82,8 @@ public function __construct($type) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php index 5428986..700abe3 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php @@ -37,7 +37,8 @@ public function __construct($value) * * This method can be overridden to implement the evaluation algorithm. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php index e8fb1fb..0d06277 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php @@ -18,8 +18,9 @@ class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider /** * Translates JSON error to a human readable string. * - * @param string $error - * @param string $prefix + * @param string $error + * @param string $prefix + * * @return string */ public static function determineJsonError($error, $prefix = '') @@ -45,7 +46,8 @@ public static function determineJsonError($error, $prefix = '') /** * Translates a given type to a human readable message prefix. * - * @param string $type + * @param string $type + * * @return string */ public static function translateTypeToPrefix($type) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php b/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php index a4fffe3..0160ec3 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php @@ -34,7 +34,8 @@ public function __construct($value) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php index 21bb14a..72e2548 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php @@ -35,7 +35,8 @@ public function __construct($constraint) } /** - * @param string $string + * @param string $string + * * @return string */ public static function negate($string) @@ -79,10 +80,12 @@ public static function negate($string) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -104,7 +107,8 @@ public function evaluate($other, $description = '', $returnResult = false) * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) @@ -146,6 +150,7 @@ public function toString() * Counts the number of constraint elements. * * @return int + * * @since Method available since Release 3.4.0 */ public function count() diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php index 7c6453a..700fbf4 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php @@ -22,7 +22,8 @@ class PHPUnit_Framework_Constraint_ObjectHasAttribute extends PHPUnit_Framework_ * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php index 4a9e71a..b261456 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php @@ -48,10 +48,12 @@ public function setConstraints(array $constraints) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -99,6 +101,7 @@ public function toString() * Counts the number of constraint elements. * * @return int + * * @since Method available since Release 3.4.0 */ public function count() diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php b/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php index 9465b10..fe1acc2 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php @@ -39,7 +39,8 @@ public function __construct($pattern) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php index 0d3d7b5..ee02bf4 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php @@ -47,7 +47,8 @@ public function __construct($string, $ignoreCase = false) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php index 1df062c..ebeb921 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php @@ -34,7 +34,8 @@ public function __construct($suffix) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php index b373855..9aee011 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php @@ -34,7 +34,8 @@ public function __construct($prefix) * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php index 39b98d9..c7072f3 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php @@ -32,9 +32,10 @@ class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework protected $value; /** - * @param mixed $value - * @param bool $checkForObjectIdentity - * @param bool $checkForNonObjectIdentity + * @param mixed $value + * @param bool $checkForObjectIdentity + * @param bool $checkForNonObjectIdentity + * * @throws PHPUnit_Framework_Exception */ public function __construct($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) @@ -58,7 +59,8 @@ public function __construct($value, $checkForObjectIdentity = true, $checkForNon * Evaluates the constraint for parameter $other. Returns true if the * constraint is met, false otherwise. * - * @param mixed $other Value or object to evaluate. + * @param mixed $other Value or object to evaluate. + * * @return bool */ protected function matches($other) @@ -110,7 +112,8 @@ public function toString() * The beginning of failure messages is "Failed asserting that" in most * cases. This method should return the second part of that sentence. * - * @param mixed $other Evaluated value or object. + * @param mixed $other Evaluated value or object. + * * @return string */ protected function failureDescription($other) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php index f2f76c4..1397b03 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php @@ -55,10 +55,12 @@ public function __construct($type, $isNativeType = true) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php index 9ce4d06..79ecbfd 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php @@ -48,10 +48,12 @@ public function setConstraints(array $constraints) * a boolean value instead: true in case of success, false in case of a * failure. * - * @param mixed $other Value or object to evaluate. - * @param string $description Additional information about the test - * @param bool $returnResult Whether to return a result or throw an exception + * @param mixed $other Value or object to evaluate. + * @param string $description Additional information about the test + * @param bool $returnResult Whether to return a result or throw an exception + * * @return mixed + * * @throws PHPUnit_Framework_ExpectationFailedException */ public function evaluate($other, $description = '', $returnResult = false) @@ -104,6 +106,7 @@ public function toString() * Counts the number of constraint elements. * * @return int + * * @since Method available since Release 3.4.0 */ public function count() diff --git a/vendor/phpunit/phpunit/src/Framework/Exception.php b/vendor/phpunit/phpunit/src/Framework/Exception.php index 4274c12..715c55e 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception.php @@ -27,7 +27,6 @@ * the parent would break the intended encapsulation of process isolation. * * @see http://fabien.potencier.org/article/9/php-serialization-stack-traces-and-exceptions - * * @since Class available since Release 3.4.0 */ class PHPUnit_Framework_Exception extends RuntimeException implements PHPUnit_Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Test.php b/vendor/phpunit/phpunit/src/Framework/Test.php index 77a25b5..0b68b3d 100644 --- a/vendor/phpunit/phpunit/src/Framework/Test.php +++ b/vendor/phpunit/phpunit/src/Framework/Test.php @@ -18,7 +18,8 @@ /** * Runs a test and collects its result in a TestResult instance. * - * @param PHPUnit_Framework_TestResult $result + * @param PHPUnit_Framework_TestResult $result + * * @return PHPUnit_Framework_TestResult */ public function run(PHPUnit_Framework_TestResult $result = null); diff --git a/vendor/phpunit/phpunit/src/Framework/TestCase.php b/vendor/phpunit/phpunit/src/Framework/TestCase.php index ea65fbc..6ee5fae 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestCase.php +++ b/vendor/phpunit/phpunit/src/Framework/TestCase.php @@ -313,6 +313,7 @@ public function count() * Returns the annotations for this test. * * @return array + * * @since Method available since Release 3.4.0 */ public function getAnnotations() @@ -326,7 +327,8 @@ public function getAnnotations() /** * Gets the name of a TestCase. * - * @param bool $withDataSet + * @param bool $withDataSet + * * @return string */ public function getName($withDataSet = true) @@ -342,6 +344,7 @@ public function getName($withDataSet = true) * Returns the size of the test. * * @return int + * * @since Method available since Release 3.6.0 */ public function getSize() @@ -354,6 +357,7 @@ public function getSize() /** * @return string + * * @since Method available since Release 3.6.0 */ public function getActualOutput() @@ -367,6 +371,7 @@ public function getActualOutput() /** * @return bool + * * @since Method available since Release 3.6.0 */ public function hasOutput() @@ -384,7 +389,9 @@ public function hasOutput() /** * @param string $expectedRegex + * * @since Method available since Release 3.6.0 + * * @throws PHPUnit_Framework_Exception */ public function expectOutputRegex($expectedRegex) @@ -400,6 +407,7 @@ public function expectOutputRegex($expectedRegex) /** * @param string $expectedString + * * @since Method available since Release 3.6.0 */ public function expectOutputString($expectedString) @@ -415,6 +423,7 @@ public function expectOutputString($expectedString) /** * @return bool + * * @since Method available since Release 3.6.5 * @deprecated */ @@ -425,6 +434,7 @@ public function hasPerformedExpectationsOnOutput() /** * @return bool + * * @since Method available since Release 4.3.3 */ public function hasExpectationOnOutput() @@ -434,6 +444,7 @@ public function hasExpectationOnOutput() /** * @return string + * * @since Method available since Release 3.2.0 */ public function getExpectedException() @@ -445,6 +456,7 @@ public function getExpectedException() * @param mixed $exceptionName * @param string $exceptionMessage * @param int $exceptionCode + * * @since Method available since Release 3.2.0 */ public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null) @@ -458,6 +470,7 @@ public function setExpectedException($exceptionName, $exceptionMessage = '', $ex * @param mixed $exceptionName * @param string $exceptionMessageRegExp * @param int $exceptionCode + * * @since Method available since Release 4.3.0 */ public function setExpectedExceptionRegExp($exceptionName, $exceptionMessageRegExp = '', $exceptionCode = null) @@ -499,6 +512,7 @@ protected function setExpectedExceptionFromAnnotation() /** * @param bool $useErrorHandler + * * @since Method available since Release 3.4.0 */ public function setUseErrorHandler($useErrorHandler) @@ -547,6 +561,7 @@ protected function checkRequirements() * Returns the status of this test. * * @return int + * * @since Method available since Release 3.1.0 */ public function getStatus() @@ -558,6 +573,7 @@ public function getStatus() * Returns the status message of this test. * * @return string + * * @since Method available since Release 3.3.0 */ public function getStatusMessage() @@ -569,6 +585,7 @@ public function getStatusMessage() * Returns whether or not this test has failed. * * @return bool + * * @since Method available since Release 3.0.0 */ public function hasFailed() @@ -583,8 +600,10 @@ public function hasFailed() * Runs the test case and collects the results in a TestResult object. * If no TestResult object is passed a new one will be created. * - * @param PHPUnit_Framework_TestResult $result + * @param PHPUnit_Framework_TestResult $result + * * @return PHPUnit_Framework_TestResult + * * @throws PHPUnit_Framework_Exception */ public function run(PHPUnit_Framework_TestResult $result = null) @@ -864,6 +883,7 @@ public function runBare() * Override to run the test and assert its state. * * @return mixed + * * @throws Exception|PHPUnit_Framework_Exception * @throws PHPUnit_Framework_Exception */ @@ -1018,6 +1038,7 @@ public function setName($name) * Sets the dependencies of a TestCase. * * @param array $dependencies + * * @since Method available since Release 3.4.0 */ public function setDependencies(array $dependencies) @@ -1029,6 +1050,7 @@ public function setDependencies(array $dependencies) * Returns true if the tests has dependencies * * @return bool + * * @since Method available since Release 4.0.0 */ public function hasDependencies() @@ -1040,6 +1062,7 @@ public function hasDependencies() * Sets * * @param array $dependencyInput + * * @since Method available since Release 3.4.0 */ public function setDependencyInput(array $dependencyInput) @@ -1049,6 +1072,7 @@ public function setDependencyInput(array $dependencyInput) /** * @param bool $disallowChangesToGlobalState + * * @since Method available since Release 4.6.0 */ public function setDisallowChangesToGlobalState($disallowChangesToGlobalState) @@ -1060,6 +1084,7 @@ public function setDisallowChangesToGlobalState($disallowChangesToGlobalState) * Calling this method in setUp() has no effect! * * @param bool $backupGlobals + * * @since Method available since Release 3.3.0 */ public function setBackupGlobals($backupGlobals) @@ -1073,6 +1098,7 @@ public function setBackupGlobals($backupGlobals) * Calling this method in setUp() has no effect! * * @param bool $backupStaticAttributes + * * @since Method available since Release 3.4.0 */ public function setBackupStaticAttributes($backupStaticAttributes) @@ -1084,8 +1110,10 @@ public function setBackupStaticAttributes($backupStaticAttributes) } /** - * @param bool $runTestInSeparateProcess + * @param bool $runTestInSeparateProcess + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.4.0 */ public function setRunTestInSeparateProcess($runTestInSeparateProcess) @@ -1100,8 +1128,10 @@ public function setRunTestInSeparateProcess($runTestInSeparateProcess) } /** - * @param bool $preserveGlobalState + * @param bool $preserveGlobalState + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.4.0 */ public function setPreserveGlobalState($preserveGlobalState) @@ -1114,8 +1144,10 @@ public function setPreserveGlobalState($preserveGlobalState) } /** - * @param bool $inIsolation + * @param bool $inIsolation + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.4.0 */ public function setInIsolation($inIsolation) @@ -1129,6 +1161,7 @@ public function setInIsolation($inIsolation) /** * @return bool + * * @since Method available since Release 4.3.0 */ public function isInIsolation() @@ -1138,6 +1171,7 @@ public function isInIsolation() /** * @return mixed + * * @since Method available since Release 3.4.0 */ public function getResult() @@ -1147,6 +1181,7 @@ public function getResult() /** * @param mixed $result + * * @since Method available since Release 3.4.0 */ public function setResult($result) @@ -1155,8 +1190,10 @@ public function setResult($result) } /** - * @param callable $callback + * @param callable $callback + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.6.0 */ public function setOutputCallback($callback) @@ -1170,6 +1207,7 @@ public function setOutputCallback($callback) /** * @return PHPUnit_Framework_TestResult + * * @since Method available since Release 3.5.7 */ public function getTestResultObject() @@ -1179,6 +1217,7 @@ public function getTestResultObject() /** * @param PHPUnit_Framework_TestResult $result + * * @since Method available since Release 3.6.0 */ public function setTestResultObject(PHPUnit_Framework_TestResult $result) @@ -1191,9 +1230,11 @@ public function setTestResultObject(PHPUnit_Framework_TestResult $result) * resets the modified php.ini setting to its original value after the * test is run. * - * @param string $varName - * @param string $newValue + * @param string $varName + * @param string $newValue + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.0.0 */ protected function iniSet($varName, $newValue) @@ -1221,9 +1262,11 @@ protected function iniSet($varName, $newValue) * This method is a wrapper for the setlocale() function that automatically * resets the locale to its original value after the test is run. * - * @param int $category - * @param string $locale + * @param int $category + * @param string $locale + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.1.0 */ protected function setLocale() @@ -1269,20 +1312,23 @@ protected function setLocale() /** * Returns a mock object for the specified class. * - * @param string $originalClassName Name of the class to mock. - * @param array|null $methods When provided, only methods whose names are in the array - * are replaced with a configurable test double. The behavior - * of the other methods is not changed. - * Providing null means that no methods will be replaced. - * @param array $arguments Parameters to pass to the original class' constructor. - * @param string $mockClassName Class name for the generated test double class. - * @param bool $callOriginalConstructor Can be used to disable the call to the original class' constructor. - * @param bool $callOriginalClone Can be used to disable the call to the original class' clone constructor. - * @param bool $callAutoload Can be used to disable __autoload() during the generation of the test double class. - * @param bool $cloneArguments - * @param bool $callOriginalMethods + * @param string $originalClassName Name of the class to mock. + * @param array|null $methods When provided, only methods whose names are in the array + * are replaced with a configurable test double. The behavior + * of the other methods is not changed. + * Providing null means that no methods will be replaced. + * @param array $arguments Parameters to pass to the original class' constructor. + * @param string $mockClassName Class name for the generated test double class. + * @param bool $callOriginalConstructor Can be used to disable the call to the original class' constructor. + * @param bool $callOriginalClone Can be used to disable the call to the original class' clone constructor. + * @param bool $callAutoload Can be used to disable __autoload() during the generation of the test double class. + * @param bool $cloneArguments + * @param bool $callOriginalMethods + * * @return PHPUnit_Framework_MockObject_MockObject + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.0.0 */ public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false) @@ -1307,8 +1353,10 @@ public function getMock($originalClassName, $methods = array(), array $arguments /** * Returns a builder object to create mock objects using a fluent interface. * - * @param string $className + * @param string $className + * * @return PHPUnit_Framework_MockObject_MockBuilder + * * @since Method available since Release 3.5.0 */ public function getMockBuilder($className) @@ -1319,16 +1367,19 @@ public function getMockBuilder($className) /** * Mocks the specified class and returns the name of the mocked class. * - * @param string $originalClassName - * @param array $methods - * @param array $arguments - * @param string $mockClassName - * @param bool $callOriginalConstructor - * @param bool $callOriginalClone - * @param bool $callAutoload - * @param bool $cloneArguments + * @param string $originalClassName + * @param array $methods + * @param array $arguments + * @param string $mockClassName + * @param bool $callOriginalConstructor + * @param bool $callOriginalClone + * @param bool $callAutoload + * @param bool $cloneArguments + * * @return string + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.5.0 */ protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = false, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false) @@ -1352,16 +1403,19 @@ protected function getMockClass($originalClassName, $methods = array(), array $a * methods of the class mocked. Concrete methods are not mocked by default. * To mock concrete methods, use the 7th parameter ($mockedMethods). * - * @param string $originalClassName - * @param array $arguments - * @param string $mockClassName - * @param bool $callOriginalConstructor - * @param bool $callOriginalClone - * @param bool $callAutoload - * @param array $mockedMethods - * @param bool $cloneArguments + * @param string $originalClassName + * @param array $arguments + * @param string $mockClassName + * @param bool $callOriginalConstructor + * @param bool $callOriginalClone + * @param bool $callAutoload + * @param array $mockedMethods + * @param bool $cloneArguments + * * @return PHPUnit_Framework_MockObject_MockObject + * * @since Method available since Release 3.4.0 + * * @throws PHPUnit_Framework_Exception */ public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false) @@ -1385,13 +1439,15 @@ public function getMockForAbstractClass($originalClassName, array $arguments = a /** * Returns a mock object based on the given WSDL file. * - * @param string $wsdlFile - * @param string $originalClassName - * @param string $mockClassName - * @param array $methods - * @param bool $callOriginalConstructor - * @param array $options An array of options passed to SOAPClient::_construct + * @param string $wsdlFile + * @param string $originalClassName + * @param string $mockClassName + * @param array $methods + * @param bool $callOriginalConstructor + * @param array $options An array of options passed to SOAPClient::_construct + * * @return PHPUnit_Framework_MockObject_MockObject + * * @since Method available since Release 3.4.0 */ protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = true, array $options = array()) @@ -1427,16 +1483,19 @@ protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClas * of the trait mocked. Concrete methods to mock can be specified with the * `$mockedMethods` parameter. * - * @param string $traitName - * @param array $arguments - * @param string $mockClassName - * @param bool $callOriginalConstructor - * @param bool $callOriginalClone - * @param bool $callAutoload - * @param array $mockedMethods - * @param bool $cloneArguments + * @param string $traitName + * @param array $arguments + * @param string $mockClassName + * @param bool $callOriginalConstructor + * @param bool $callOriginalClone + * @param bool $callAutoload + * @param array $mockedMethods + * @param bool $cloneArguments + * * @return PHPUnit_Framework_MockObject_MockObject + * * @since Method available since Release 4.0.0 + * * @throws PHPUnit_Framework_Exception */ public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false) @@ -1460,15 +1519,18 @@ public function getMockForTrait($traitName, array $arguments = array(), $mockCla /** * Returns an object for the specified trait. * - * @param string $traitName - * @param array $arguments - * @param string $traitClassName - * @param bool $callOriginalConstructor - * @param bool $callOriginalClone - * @param bool $callAutoload - * @param bool $cloneArguments + * @param string $traitName + * @param array $arguments + * @param string $traitClassName + * @param bool $callOriginalConstructor + * @param bool $callOriginalClone + * @param bool $callAutoload + * @param bool $cloneArguments + * * @return object + * * @since Method available since Release 3.6.0 + * * @throws PHPUnit_Framework_Exception */ protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false) @@ -1485,9 +1547,12 @@ protected function getObjectForTrait($traitName, array $arguments = array(), $tr } /** - * @param string|null $classOrInterface + * @param string|null $classOrInterface + * * @return \Prophecy\Prophecy\ObjectProphecy + * * @throws \LogicException + * * @since Method available since Release 4.5.0 */ protected function prophesize($classOrInterface = null) @@ -1499,6 +1564,7 @@ protected function prophesize($classOrInterface = null) * Adds a value to the assertion counter. * * @param int $count + * * @since Method available since Release 3.3.3 */ public function addToAssertionCount($count) @@ -1510,6 +1576,7 @@ public function addToAssertionCount($count) * Returns the number of assertions performed by this test. * * @return int + * * @since Method available since Release 3.3.0 */ public function getNumAssertions() @@ -1522,6 +1589,7 @@ public function getNumAssertions() * zero or more times. * * @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount + * * @since Method available since Release 3.0.0 */ public static function any() @@ -1533,6 +1601,7 @@ public static function any() * Returns a matcher that matches when the method is never executed. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount + * * @since Method available since Release 3.0.0 */ public static function never() @@ -1544,8 +1613,10 @@ public static function never() * Returns a matcher that matches when the method is executed * at least N times. * - * @param int $requiredInvocations + * @param int $requiredInvocations + * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount + * * @since Method available since Release 4.2.0 */ public static function atLeast($requiredInvocations) @@ -1559,6 +1630,7 @@ public static function atLeast($requiredInvocations) * Returns a matcher that matches when the method is executed at least once. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce + * * @since Method available since Release 3.0.0 */ public static function atLeastOnce() @@ -1570,6 +1642,7 @@ public static function atLeastOnce() * Returns a matcher that matches when the method is executed exactly once. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount + * * @since Method available since Release 3.0.0 */ public static function once() @@ -1581,8 +1654,10 @@ public static function once() * Returns a matcher that matches when the method is executed * exactly $count times. * - * @param int $count + * @param int $count + * * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount + * * @since Method available since Release 3.0.0 */ public static function exactly($count) @@ -1594,8 +1669,10 @@ public static function exactly($count) * Returns a matcher that matches when the method is executed * at most N times. * - * @param int $allowedInvocations + * @param int $allowedInvocations + * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount + * * @since Method available since Release 4.2.0 */ public static function atMost($allowedInvocations) @@ -1609,8 +1686,10 @@ public static function atMost($allowedInvocations) * Returns a matcher that matches when the method is executed * at the given index. * - * @param int $index + * @param int $index + * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex + * * @since Method available since Release 3.0.0 */ public static function at($index) @@ -1619,8 +1698,10 @@ public static function at($index) } /** - * @param mixed $value + * @param mixed $value + * * @return PHPUnit_Framework_MockObject_Stub_Return + * * @since Method available since Release 3.0.0 */ public static function returnValue($value) @@ -1629,8 +1710,10 @@ public static function returnValue($value) } /** - * @param array $valueMap + * @param array $valueMap + * * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap + * * @since Method available since Release 3.6.0 */ public static function returnValueMap(array $valueMap) @@ -1639,8 +1722,10 @@ public static function returnValueMap(array $valueMap) } /** - * @param int $argumentIndex + * @param int $argumentIndex + * * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument + * * @since Method available since Release 3.3.0 */ public static function returnArgument($argumentIndex) @@ -1651,8 +1736,10 @@ public static function returnArgument($argumentIndex) } /** - * @param mixed $callback + * @param mixed $callback + * * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback + * * @since Method available since Release 3.3.0 */ public static function returnCallback($callback) @@ -1666,6 +1753,7 @@ public static function returnCallback($callback) * This method is useful when mocking a fluent interface. * * @return PHPUnit_Framework_MockObject_Stub_ReturnSelf + * * @since Method available since Release 3.6.0 */ public static function returnSelf() @@ -1674,8 +1762,10 @@ public static function returnSelf() } /** - * @param Exception $exception + * @param Exception $exception + * * @return PHPUnit_Framework_MockObject_Stub_Exception + * * @since Method available since Release 3.1.0 */ public static function throwException(Exception $exception) @@ -1684,8 +1774,10 @@ public static function throwException(Exception $exception) } /** - * @param mixed $value, ... + * @param mixed $value, ... + * * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls + * * @since Method available since Release 3.0.0 */ public static function onConsecutiveCalls() @@ -1698,8 +1790,10 @@ public static function onConsecutiveCalls() /** * Gets the data set description of a TestCase. * - * @param bool $includeData + * @param bool $includeData + * * @return string + * * @since Method available since Release 3.3.0 */ protected function getDataSetAsString($includeData = true) @@ -1861,7 +1955,9 @@ public static function tearDownAfterClass() * This method is called when a test method did not execute successfully. * * @param Exception $e + * * @since Method available since Release 3.4.0 + * * @throws Exception */ protected function onNotSuccessfulTest(Exception $e) @@ -1873,6 +1969,7 @@ protected function onNotSuccessfulTest(Exception $e) * Performs custom preparations on the process isolation template. * * @param Text_Template $template + * * @since Method available since Release 3.4.0 */ protected function prepareTemplate(Text_Template $template) @@ -1961,10 +2058,16 @@ private function restoreGlobalState() $backupGlobals = $this->backupGlobals === null || $this->backupGlobals === true; if ($this->disallowChangesToGlobalState) { - $this->compareGlobalStateSnapshots( - $this->snapshot, - $this->createGlobalStateSnapshot($backupGlobals) - ); + try { + $this->compareGlobalStateSnapshots( + $this->snapshot, + $this->createGlobalStateSnapshot($backupGlobals) + ); + } + + catch (PHPUnit_Framework_RiskyTestError $rte) { + // Intentionally left empty + } } $restorer = new Restorer; @@ -1978,10 +2081,15 @@ private function restoreGlobalState() } $this->snapshot = null; + + if (isset($rte)) { + throw $rte; + } } /** - * @param bool $backupGlobals + * @param bool $backupGlobals + * * @return Snapshot */ private function createGlobalStateSnapshot($backupGlobals) @@ -2025,8 +2133,9 @@ private function createGlobalStateSnapshot($backupGlobals) } /** - * @param Snapshot $before - * @param Snapshot $after + * @param Snapshot $before + * @param Snapshot $after + * * @throws PHPUnit_Framework_RiskyTestError */ private function compareGlobalStateSnapshots(Snapshot $before, Snapshot $after) @@ -2057,9 +2166,10 @@ private function compareGlobalStateSnapshots(Snapshot $before, Snapshot $after) } /** - * @param array $before - * @param array $after - * @param string $header + * @param array $before + * @param array $after + * @param string $header + * * @throws PHPUnit_Framework_RiskyTestError */ private function compareGlobalStateSnapshotPart(array $before, array $after, $header) @@ -2081,6 +2191,7 @@ private function compareGlobalStateSnapshotPart(array $before, array $after, $he /** * @return Prophecy\Prophet + * * @since Method available since Release 4.5.0 */ private function getProphet() diff --git a/vendor/phpunit/phpunit/src/Framework/TestFailure.php b/vendor/phpunit/phpunit/src/Framework/TestFailure.php index df1d5ef..ef3d9cb 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestFailure.php +++ b/vendor/phpunit/phpunit/src/Framework/TestFailure.php @@ -67,6 +67,7 @@ public function toString() * Returns a description for the thrown exception. * * @return string + * * @since Method available since Release 3.4.0 */ public function getExceptionAsString() @@ -77,8 +78,10 @@ public function getExceptionAsString() /** * Returns a description for an exception. * - * @param Exception $e + * @param Exception $e + * * @return string + * * @since Method available since Release 3.2.0 */ public static function exceptionToString(Exception $e) @@ -108,6 +111,7 @@ public static function exceptionToString(Exception $e) * Returns the name of the failing test (including data set, if any). * * @return string + * * @since Method available since Release 4.3.0 */ public function getTestName() diff --git a/vendor/phpunit/phpunit/src/Framework/TestListener.php b/vendor/phpunit/phpunit/src/Framework/TestListener.php index 056cab3..6baab55 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestListener.php +++ b/vendor/phpunit/phpunit/src/Framework/TestListener.php @@ -48,6 +48,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time); @@ -58,6 +59,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time); * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 3.0.0 */ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time); @@ -66,6 +68,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time * A test suite started. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function startTestSuite(PHPUnit_Framework_TestSuite $suite); @@ -74,6 +77,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite); * A test suite ended. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function endTestSuite(PHPUnit_Framework_TestSuite $suite); diff --git a/vendor/phpunit/phpunit/src/Framework/TestResult.php b/vendor/phpunit/phpunit/src/Framework/TestResult.php index 41c5d0a..8da7c35 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestResult.php +++ b/vendor/phpunit/phpunit/src/Framework/TestResult.php @@ -285,6 +285,7 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser * Informs the result that a testsuite will be started. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -302,6 +303,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) * Informs the result that a testsuite was completed. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function endTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -358,6 +360,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time) * Returns true if no risky test occurred. * * @return bool + * * @since Method available since Release 4.0.0 */ public function allHarmless() @@ -369,6 +372,7 @@ public function allHarmless() * Gets the number of risky tests. * * @return int + * * @since Method available since Release 4.0.0 */ public function riskyCount() @@ -400,6 +404,7 @@ public function notImplementedCount() * Returns an Enumeration for the risky tests. * * @return array + * * @since Method available since Release 4.0.0 */ public function risky() @@ -421,6 +426,7 @@ public function notImplemented() * Returns true if no test has been skipped. * * @return bool + * * @since Method available since Release 3.0.0 */ public function noneSkipped() @@ -432,6 +438,7 @@ public function noneSkipped() * Gets the number of skipped tests. * * @return int + * * @since Method available since Release 3.0.0 */ public function skippedCount() @@ -443,6 +450,7 @@ public function skippedCount() * Returns an Enumeration for the skipped tests. * * @return array + * * @since Method available since Release 3.0.0 */ public function skipped() @@ -494,6 +502,7 @@ public function failures() * Returns the names of the tests that have passed. * * @return array + * * @since Method available since Release 3.4.0 */ public function passed() @@ -505,6 +514,7 @@ public function passed() * Returns the (top) test suite. * * @return PHPUnit_Framework_TestSuite + * * @since Method available since Release 3.0.0 */ public function topTestSuite() @@ -516,6 +526,7 @@ public function topTestSuite() * Returns whether code coverage information should be collected. * * @return bool If code coverage should be collected + * * @since Method available since Release 3.2.0 */ public function getCollectCodeCoverageInformation() @@ -754,6 +765,7 @@ public function stop() * Returns the PHP_CodeCoverage object. * * @return PHP_CodeCoverage + * * @since Method available since Release 3.5.0 */ public function getCodeCoverage() @@ -765,6 +777,7 @@ public function getCodeCoverage() * Sets the PHP_CodeCoverage object. * * @param PHP_CodeCoverage $codeCoverage + * * @since Method available since Release 3.6.0 */ public function setCodeCoverage(PHP_CodeCoverage $codeCoverage) @@ -775,8 +788,10 @@ public function setCodeCoverage(PHP_CodeCoverage $codeCoverage) /** * Enables or disables the error-to-exception conversion. * - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.2.14 */ public function convertErrorsToExceptions($flag) @@ -792,6 +807,7 @@ public function convertErrorsToExceptions($flag) * Returns the error-to-exception conversion setting. * * @return bool + * * @since Method available since Release 3.4.0 */ public function getConvertErrorsToExceptions() @@ -802,8 +818,10 @@ public function getConvertErrorsToExceptions() /** * Enables or disables the stopping when an error occurs. * - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.5.0 */ public function stopOnError($flag) @@ -818,8 +836,10 @@ public function stopOnError($flag) /** * Enables or disables the stopping when a failure occurs. * - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.1.0 */ public function stopOnFailure($flag) @@ -832,8 +852,10 @@ public function stopOnFailure($flag) } /** - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.0.0 */ public function beStrictAboutTestsThatDoNotTestAnything($flag) @@ -847,6 +869,7 @@ public function beStrictAboutTestsThatDoNotTestAnything($flag) /** * @return bool + * * @since Method available since Release 4.0.0 */ public function isStrictAboutTestsThatDoNotTestAnything() @@ -855,8 +878,10 @@ public function isStrictAboutTestsThatDoNotTestAnything() } /** - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.0.0 */ public function beStrictAboutOutputDuringTests($flag) @@ -870,6 +895,7 @@ public function beStrictAboutOutputDuringTests($flag) /** * @return bool + * * @since Method available since Release 4.0.0 */ public function isStrictAboutOutputDuringTests() @@ -878,8 +904,10 @@ public function isStrictAboutOutputDuringTests() } /** - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.0.0 */ public function beStrictAboutTestSize($flag) @@ -893,6 +921,7 @@ public function beStrictAboutTestSize($flag) /** * @return bool + * * @since Method available since Release 4.0.0 */ public function isStrictAboutTestSize() @@ -901,8 +930,10 @@ public function isStrictAboutTestSize() } /** - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.2.0 */ public function beStrictAboutTodoAnnotatedTests($flag) @@ -916,6 +947,7 @@ public function beStrictAboutTodoAnnotatedTests($flag) /** * @return bool + * * @since Method available since Release 4.2.0 */ public function isStrictAboutTodoAnnotatedTests() @@ -926,8 +958,10 @@ public function isStrictAboutTodoAnnotatedTests() /** * Enables or disables the stopping for risky tests. * - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 4.0.0 */ public function stopOnRisky($flag) @@ -942,8 +976,10 @@ public function stopOnRisky($flag) /** * Enables or disables the stopping for incomplete tests. * - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.5.0 */ public function stopOnIncomplete($flag) @@ -958,8 +994,10 @@ public function stopOnIncomplete($flag) /** * Enables or disables the stopping for skipped tests. * - * @param bool $flag + * @param bool $flag + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.1.0 */ public function stopOnSkipped($flag) @@ -994,8 +1032,10 @@ public function wasSuccessful() /** * Sets the timeout for small tests. * - * @param int $timeout + * @param int $timeout + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.6.0 */ public function setTimeoutForSmallTests($timeout) @@ -1010,8 +1050,10 @@ public function setTimeoutForSmallTests($timeout) /** * Sets the timeout for medium tests. * - * @param int $timeout + * @param int $timeout + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.6.0 */ public function setTimeoutForMediumTests($timeout) @@ -1026,8 +1068,10 @@ public function setTimeoutForMediumTests($timeout) /** * Sets the timeout for large tests. * - * @param int $timeout + * @param int $timeout + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.6.0 */ public function setTimeoutForLargeTests($timeout) @@ -1042,8 +1086,9 @@ public function setTimeoutForLargeTests($timeout) /** * Returns the class hierarchy for a given class. * - * @param string $className - * @param bool $asReflectionObjects + * @param string $className + * @param bool $asReflectionObjects + * * @return array */ protected function getHierarchy($className, $asReflectionObjects = false) diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/vendor/phpunit/phpunit/src/Framework/TestSuite.php index 7674f2d..8403633 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSuite.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSuite.php @@ -131,8 +131,9 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra * name of an existing class) or constructs an empty TestSuite * with the given name. * - * @param mixed $theClass - * @param string $name + * @param mixed $theClass + * @param string $name + * * @throws PHPUnit_Framework_Exception */ public function __construct($theClass = '', $name = '') @@ -254,7 +255,8 @@ public function addTest(PHPUnit_Framework_Test $test, $groups = array()) /** * Adds the tests from the given class to the suite. * - * @param mixed $testClass + * @param mixed $testClass + * * @throws PHPUnit_Framework_Exception */ public function addTestSuite($testClass) @@ -307,8 +309,10 @@ public function addTestSuite($testClass) * added, a PHPUnit_Framework_Warning will be created instead, * leaving the current test run untouched. * - * @param string $filename + * @param string $filename + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 2.3.0 */ public function addTestFile($filename) @@ -385,8 +389,10 @@ public function addTestFile($filename) /** * Wrapper for addTestFile() that adds multiple test files. * - * @param array|Iterator $filenames + * @param array|Iterator $filenames + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 2.3.0 */ public function addTestFiles($filenames) @@ -407,7 +413,8 @@ public function addTestFiles($filenames) /** * Counts the number of test cases that will be run by this test. * - * @param bool $preferCache Indicates if cache is preferred. + * @param bool $preferCache Indicates if cache is preferred. + * * @return int */ public function count($preferCache = false) @@ -426,9 +433,11 @@ public function count($preferCache = false) } /** - * @param ReflectionClass $theClass - * @param string $name + * @param ReflectionClass $theClass + * @param string $name + * * @return PHPUnit_Framework_Test + * * @throws PHPUnit_Framework_Exception */ public static function createTest(ReflectionClass $theClass, $name) @@ -628,6 +637,7 @@ public function getName() * Returns the test groups of the suite. * * @return array + * * @since Method available since Release 3.2.0 */ public function getGroups() @@ -644,6 +654,7 @@ public function getGroupDetails() * Set tests groups of the test case * * @param array $groups + * * @since Method available since Release 4.0.0 */ public function setGroupDetails(array $groups) @@ -654,7 +665,8 @@ public function setGroupDetails(array $groups) /** * Runs the tests and collects their result in a TestResult. * - * @param PHPUnit_Framework_TestResult $result + * @param PHPUnit_Framework_TestResult $result + * * @return PHPUnit_Framework_TestResult */ public function run(PHPUnit_Framework_TestResult $result = null) @@ -749,8 +761,10 @@ class_exists($this->name, false) && } /** - * @param bool $runTestInSeparateProcess + * @param bool $runTestInSeparateProcess + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.7.0 */ public function setRunTestInSeparateProcess($runTestInSeparateProcess) @@ -766,6 +780,7 @@ public function setRunTestInSeparateProcess($runTestInSeparateProcess) * Runs a test. * * @deprecated + * * @param PHPUnit_Framework_Test $test * @param PHPUnit_Framework_TestResult $result */ @@ -788,6 +803,7 @@ public function setName($name) * Returns the test at the given index. * * @param int + * * @return PHPUnit_Framework_Test */ public function testAt($index) @@ -813,6 +829,7 @@ public function tests() * Set tests of the test suite * * @param array $tests + * * @since Method available since Release 4.0.0 */ public function setTests(array $tests) @@ -823,8 +840,10 @@ public function setTests(array $tests) /** * Mark the test suite as skipped. * - * @param string $message + * @param string $message + * * @throws PHPUnit_Framework_SkippedTestSuiteError + * * @since Method available since Release 3.0.0 */ public function markTestSuiteSkipped($message = '') @@ -874,7 +893,8 @@ protected function addTestMethod(ReflectionClass $class, ReflectionMethod $metho } /** - * @param ReflectionMethod $method + * @param ReflectionMethod $method + * * @return bool */ public static function isTestMethod(ReflectionMethod $method) @@ -892,7 +912,8 @@ public static function isTestMethod(ReflectionMethod $method) } /** - * @param string $message + * @param string $message + * * @return PHPUnit_Framework_Warning */ protected static function warning($message) @@ -901,10 +922,12 @@ protected static function warning($message) } /** - * @param string $class - * @param string $methodName - * @param string $message + * @param string $class + * @param string $methodName + * @param string $message + * * @return PHPUnit_Framework_SkippedTestCase + * * @since Method available since Release 4.3.0 */ protected static function skipTest($class, $methodName, $message) @@ -913,10 +936,12 @@ protected static function skipTest($class, $methodName, $message) } /** - * @param string $class - * @param string $methodName - * @param string $message + * @param string $class + * @param string $methodName + * @param string $message + * * @return PHPUnit_Framework_IncompleteTestCase + * * @since Method available since Release 4.3.0 */ protected static function incompleteTest($class, $methodName, $message) @@ -926,6 +951,7 @@ protected static function incompleteTest($class, $methodName, $message) /** * @param bool $disallowChangesToGlobalState + * * @since Method available since Release 4.6.0 */ public function setDisallowChangesToGlobalState($disallowChangesToGlobalState) @@ -937,6 +963,7 @@ public function setDisallowChangesToGlobalState($disallowChangesToGlobalState) /** * @param bool $backupGlobals + * * @since Method available since Release 3.3.0 */ public function setBackupGlobals($backupGlobals) @@ -948,6 +975,7 @@ public function setBackupGlobals($backupGlobals) /** * @param bool $backupStaticAttributes + * * @since Method available since Release 3.4.0 */ public function setBackupStaticAttributes($backupStaticAttributes) @@ -962,6 +990,7 @@ public function setBackupStaticAttributes($backupStaticAttributes) * Returns an iterator for this test suite. * * @return RecursiveIteratorIterator + * * @since Method available since Release 3.1.0 */ public function getIterator() diff --git a/vendor/phpunit/phpunit/src/Framework/Warning.php b/vendor/phpunit/phpunit/src/Framework/Warning.php index 6ac3cdc..8c7cef6 100644 --- a/vendor/phpunit/phpunit/src/Framework/Warning.php +++ b/vendor/phpunit/phpunit/src/Framework/Warning.php @@ -59,6 +59,7 @@ protected function runTest() /** * @return string + * * @since Method available since Release 3.0.0 */ public function getMessage() @@ -70,6 +71,7 @@ public function getMessage() * Returns a string representation of the test case. * * @return string + * * @since Method available since Release 3.4.0 */ public function toString() diff --git a/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php b/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php index f839cd0..15805dc 100644 --- a/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php +++ b/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php @@ -38,9 +38,10 @@ public function getLoader() * This is a template method, subclasses override * the runFailed() and clearStatus() methods. * - * @param string $suiteClassName - * @param string $suiteClassFile - * @param mixed $suffixes + * @param string $suiteClassName + * @param string $suiteClassFile + * @param mixed $suffixes + * * @return PHPUnit_Framework_Test */ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '') @@ -110,8 +111,9 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '') /** * Returns the loaded ReflectionClass for a suite name. * - * @param string $suiteClassName - * @param string $suiteClassFile + * @param string $suiteClassName + * @param string $suiteClassFile + * * @return ReflectionClass */ protected function loadSuiteClass($suiteClassName, $suiteClassFile = '') diff --git a/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php index e7b802a..3338a73 100644 --- a/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php +++ b/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php @@ -16,9 +16,11 @@ class PHPUnit_Runner_StandardTestSuiteLoader implements PHPUnit_Runner_TestSuiteLoader { /** - * @param string $suiteClassName - * @param string $suiteClassFile + * @param string $suiteClassName + * @param string $suiteClassFile + * * @return ReflectionClass + * * @throws PHPUnit_Framework_Exception */ public function load($suiteClassName, $suiteClassFile = '') @@ -105,7 +107,8 @@ public function load($suiteClassName, $suiteClassFile = '') } /** - * @param ReflectionClass $aClass + * @param ReflectionClass $aClass + * * @return ReflectionClass */ public function reload(ReflectionClass $aClass) diff --git a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php index 572153a..3eea6e0 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php +++ b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php @@ -16,14 +16,16 @@ interface PHPUnit_Runner_TestSuiteLoader { /** - * @param string $suiteClassName - * @param string $suiteClassFile + * @param string $suiteClassName + * @param string $suiteClassFile + * * @return ReflectionClass */ public function load($suiteClassName, $suiteClassFile = ''); /** - * @param ReflectionClass $aClass + * @param ReflectionClass $aClass + * * @return ReflectionClass */ public function reload(ReflectionClass $aClass); diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php index 58e3390..2b7f7f0 100644 --- a/vendor/phpunit/phpunit/src/Runner/Version.php +++ b/vendor/phpunit/phpunit/src/Runner/Version.php @@ -30,7 +30,7 @@ public static function id() } if (self::$version === null) { - $version = new SebastianBergmann\Version('4.8.11', dirname(dirname(__DIR__))); + $version = new SebastianBergmann\Version('4.8.18', dirname(dirname(__DIR__))); self::$version = $version->getVersion(); } @@ -39,6 +39,16 @@ public static function id() /** * @return string + * + * @since Method available since Release 4.8.13 + */ + public static function series() + { + return implode('.', array_slice(explode('.', self::id()), 0, 2)); + } + + /** + * @return string */ public static function getVersionString() { @@ -47,6 +57,7 @@ public static function getVersionString() /** * @return string + * * @since Method available since Release 4.0.0 */ public static function getReleaseChannel() diff --git a/vendor/phpunit/phpunit/src/TextUI/Command.php b/vendor/phpunit/phpunit/src/TextUI/Command.php index 6a73409..c6d6c22 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command.php @@ -101,8 +101,9 @@ public static function main($exit = true) } /** - * @param array $argv - * @param bool $exit + * @param array $argv + * @param bool $exit + * * @return int */ public function run(array $argv, $exit = true) @@ -169,6 +170,7 @@ public function run(array $argv, $exit = true) * Create a TestRunner, override in subclasses. * * @return PHPUnit_TextUI_TestRunner + * * @since Method available since Release 3.6.0 */ protected function createRunner() @@ -227,6 +229,8 @@ protected function handleArguments(array $argv) $this->longOptions['check-version'] = null; $this->longOptions['selfupdate'] = null; $this->longOptions['self-update'] = null; + $this->longOptions['selfupgrade'] = null; + $this->longOptions['self-upgrade'] = null; } try { @@ -484,6 +488,15 @@ protected function handleArguments(array $argv) $this->handleSelfUpdate(); break; + case '--selfupgrade': + case '--self-upgrade': + $this->handleSelfUpdate(true); + break; + + case '--whitelist': + $this->arguments['whitelist'] = $option[1]; + break; + default: $optionName = str_replace('--', '', $option[0]); @@ -665,8 +678,9 @@ protected function handleArguments(array $argv) /** * Handles the loading of the PHPUnit_Runner_TestSuiteLoader implementation. * - * @param string $loaderClass - * @param string $loaderFile + * @param string $loaderClass + * @param string $loaderFile + * * @return PHPUnit_Runner_TestSuiteLoader */ protected function handleLoader($loaderClass, $loaderFile = '') @@ -709,8 +723,9 @@ protected function handleLoader($loaderClass, $loaderFile = '') /** * Handles the loading of the PHPUnit_Util_Printer implementation. * - * @param string $printerClass - * @param string $printerFile + * @param string $printerClass + * @param string $printerFile + * * @return PHPUnit_Util_Printer */ protected function handlePrinter($printerClass, $printerFile = '') @@ -770,7 +785,7 @@ protected function handleBootstrap($filename) /** * @since Method available since Release 4.0.0 */ - protected function handleSelfUpdate() + protected function handleSelfUpdate($upgrade = false) { $this->printVersionString(); @@ -786,17 +801,28 @@ protected function handleSelfUpdate() exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT); } - if (PHP_VERSION_ID < 50600) { - $remoteFilename = sprintf('https://phar.phpunit.de/phpunit-old.phar'); + if (!$upgrade) { + $remoteFilename = sprintf( + 'https://phar.phpunit.de/phpunit-%s.phar', + file_get_contents( + sprintf( + 'https://phar.phpunit.de/latest-version-of/phpunit-%s', + PHPUnit_Runner_Version::series() + ) + ) + ); } else { - $remoteFilename = sprintf('https://phar.phpunit.de/phpunit.phar'); + $remoteFilename = sprintf( + 'https://phar.phpunit.de/phpunit%s.phar', + PHPUnit_Runner_Version::getReleaseChannel() + ); } $tempFilename = tempnam(sys_get_temp_dir(), 'phpunit') . '.phar'; // Workaround for https://bugs.php.net/bug.php?id=65538 $caFile = dirname($tempFilename) . '/ca.pem'; - copy(__PHPUNIT_PHAR_ROOT__ . '/phar/ca.pem', $caFile); + copy(__PHPUNIT_PHAR_ROOT__ . '/ca.pem', $caFile); print 'Updating the PHPUnit PHAR ... '; @@ -858,7 +884,7 @@ protected function handleVersionCheck() if ($isOutdated) { print "You are not using the latest version of PHPUnit.\n"; - print 'Use "phpunit --self-update" to install PHPUnit ' . $latestVersion . "\n"; + print 'Use "phpunit --self-upgrade" to install PHPUnit ' . $latestVersion . "\n"; } else { print "You are using the latest version of PHPUnit.\n"; } @@ -954,7 +980,8 @@ protected function showHelp() if (defined('__PHPUNIT_PHAR__')) { print "\n --check-version Check whether PHPUnit is the latest version."; - print "\n --self-update Update PHPUnit to the latest version.\n"; + print "\n --self-update Update PHPUnit to the latest version within the same\n release series.\n"; + print "\n --self-upgrade Upgrade PHPUnit to the latest version.\n"; } } diff --git a/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php b/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php index 3fc8cbe..e4f02cd 100644 --- a/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php @@ -108,12 +108,14 @@ class PHPUnit_TextUI_ResultPrinter extends PHPUnit_Util_Printer implements PHPUn /** * Constructor. * - * @param mixed $out - * @param bool $verbose - * @param string $colors - * @param bool $debug - * @param int|string $numberOfColumns + * @param mixed $out + * @param bool $verbose + * @param string $colors + * @param bool $debug + * @param int|string $numberOfColumns + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.0.0 */ public function __construct($out = null, $verbose = false, $colors = self::COLOR_DEFAULT, $debug = false, $numberOfColumns = 80) @@ -298,6 +300,7 @@ protected function printIncompletes(PHPUnit_Framework_TestResult $result) /** * @param PHPUnit_Framework_TestResult $result + * * @since Method available since Release 4.0.0 */ protected function printRisky(PHPUnit_Framework_TestResult $result) @@ -307,6 +310,7 @@ protected function printRisky(PHPUnit_Framework_TestResult $result) /** * @param PHPUnit_Framework_TestResult $result + * * @since Method available since Release 3.0.0 */ protected function printSkipped(PHPUnit_Framework_TestResult $result) @@ -425,6 +429,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -439,6 +444,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 3.0.0 */ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -451,6 +457,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time * A testsuite started. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -466,6 +473,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) * A testsuite ended. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function endTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -550,9 +558,11 @@ protected function writeNewLine() * Formats a buffer with a specified ANSI color sequence if colors are * enabled. * - * @param string $color - * @param string $buffer + * @param string $color + * @param string $buffer + * * @return string + * * @since Method available since Release 4.0.0 */ protected function formatWithColor($color, $buffer) @@ -587,6 +597,7 @@ protected function formatWithColor($color, $buffer) * @param string $color * @param string $buffer * @param bool $lf + * * @since Method available since Release 4.0.0 */ protected function writeWithColor($color, $buffer, $lf = true) @@ -603,6 +614,7 @@ protected function writeWithColor($color, $buffer, $lf = true) * * @param string $color * @param string $buffer + * * @since Method available since Release 4.0.0 */ protected function writeProgressWithColor($color, $buffer) @@ -616,6 +628,7 @@ protected function writeProgressWithColor($color, $buffer) * @param string $name * @param string $color * @param bool $always + * * @since Method available since Release 4.6.5 */ private function writeCountString($count, $name, $color, $always = false) diff --git a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php index 94909d9..7164861 100644 --- a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php +++ b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php @@ -55,6 +55,7 @@ class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner /** * @param PHPUnit_Runner_TestSuiteLoader $loader * @param PHP_CodeCoverage_Filter $filter + * * @since Method available since Release 3.4.0 */ public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = null, PHP_CodeCoverage_Filter $filter = null) @@ -69,9 +70,11 @@ public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = null, PHP_C } /** - * @param PHPUnit_Framework_Test|ReflectionClass $test - * @param array $arguments + * @param PHPUnit_Framework_Test|ReflectionClass $test + * @param array $arguments + * * @return PHPUnit_Framework_TestResult + * * @throws PHPUnit_Framework_Exception */ public static function run($test, array $arguments = array()) @@ -136,8 +139,9 @@ private function processSuiteFilters(PHPUnit_Framework_TestSuite $suite, array $ } /** - * @param PHPUnit_Framework_Test $suite - * @param array $arguments + * @param PHPUnit_Framework_Test $suite + * @param array $arguments + * * @return PHPUnit_Framework_TestResult */ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array()) @@ -448,11 +452,17 @@ class_exists($arguments['printer'], false)) { "\nGenerating code coverage report in Clover XML format ..." ); - $writer = new PHP_CodeCoverage_Report_Clover; - $writer->process($codeCoverage, $arguments['coverageClover']); + try { + $writer = new PHP_CodeCoverage_Report_Clover; + $writer->process($codeCoverage, $arguments['coverageClover']); - $this->printer->write(" done\n"); - unset($writer); + $this->printer->write(" done\n"); + unset($writer); + } catch (PHP_CodeCoverage_Exception $e) { + $this->printer->write( + " failed\n" . $e->getMessage() . "\n" + ); + } } if (isset($arguments['coverageCrap4J'])) { @@ -460,11 +470,17 @@ class_exists($arguments['printer'], false)) { "\nGenerating Crap4J report XML file ..." ); - $writer = new PHP_CodeCoverage_Report_Crap4j($arguments['crap4jThreshold']); - $writer->process($codeCoverage, $arguments['coverageCrap4J']); + try { + $writer = new PHP_CodeCoverage_Report_Crap4j($arguments['crap4jThreshold']); + $writer->process($codeCoverage, $arguments['coverageCrap4J']); - $this->printer->write(" done\n"); - unset($writer); + $this->printer->write(" done\n"); + unset($writer); + } catch (PHP_CodeCoverage_Exception $e) { + $this->printer->write( + " failed\n" . $e->getMessage() . "\n" + ); + } } if (isset($arguments['coverageHtml'])) { @@ -472,19 +488,25 @@ class_exists($arguments['printer'], false)) { "\nGenerating code coverage report in HTML format ..." ); - $writer = new PHP_CodeCoverage_Report_HTML( - $arguments['reportLowUpperBound'], - $arguments['reportHighLowerBound'], - sprintf( - ' and PHPUnit %s', - PHPUnit_Runner_Version::id() - ) - ); + try { + $writer = new PHP_CodeCoverage_Report_HTML( + $arguments['reportLowUpperBound'], + $arguments['reportHighLowerBound'], + sprintf( + ' and PHPUnit %s', + PHPUnit_Runner_Version::id() + ) + ); - $writer->process($codeCoverage, $arguments['coverageHtml']); + $writer->process($codeCoverage, $arguments['coverageHtml']); - $this->printer->write(" done\n"); - unset($writer); + $this->printer->write(" done\n"); + unset($writer); + } catch (PHP_CodeCoverage_Exception $e) { + $this->printer->write( + " failed\n" . $e->getMessage() . "\n" + ); + } } if (isset($arguments['coveragePHP'])) { @@ -492,17 +514,23 @@ class_exists($arguments['printer'], false)) { "\nGenerating code coverage report in PHP format ..." ); - $writer = new PHP_CodeCoverage_Report_PHP; - $writer->process($codeCoverage, $arguments['coveragePHP']); + try { + $writer = new PHP_CodeCoverage_Report_PHP; + $writer->process($codeCoverage, $arguments['coveragePHP']); - $this->printer->write(" done\n"); - unset($writer); + $this->printer->write(" done\n"); + unset($writer); + } catch (PHP_CodeCoverage_Exception $e) { + $this->printer->write( + " failed\n" . $e->getMessage() . "\n" + ); + } } if (isset($arguments['coverageText'])) { if ($arguments['coverageText'] == 'php://stdout') { $outputStream = $this->printer; - $colors = $arguments['colors']; + $colors = $arguments['colors'] && $arguments['colors'] != PHPUnit_TextUI_ResultPrinter::COLOR_NEVER; } else { $outputStream = new PHPUnit_Util_Printer($arguments['coverageText']); $colors = false; @@ -525,11 +553,17 @@ class_exists($arguments['printer'], false)) { "\nGenerating code coverage report in PHPUnit XML format ..." ); - $writer = new PHP_CodeCoverage_Report_XML; - $writer->process($codeCoverage, $arguments['coverageXml']); + try { + $writer = new PHP_CodeCoverage_Report_XML; + $writer->process($codeCoverage, $arguments['coverageXml']); - $this->printer->write(" done\n"); - unset($writer); + $this->printer->write(" done\n"); + unset($writer); + } catch (PHP_CodeCoverage_Exception $e) { + $this->printer->write( + " failed\n" . $e->getMessage() . "\n" + ); + } } } @@ -558,6 +592,7 @@ protected function runFailed($message) /** * @param string $buffer + * * @since Method available since Release 3.1.0 */ protected function write($buffer) @@ -577,6 +612,7 @@ protected function write($buffer) * Returns the loader to be used. * * @return PHPUnit_Runner_TestSuiteLoader + * * @since Method available since Release 2.2.0 */ public function getLoader() @@ -590,6 +626,7 @@ public function getLoader() /** * @param array $arguments + * * @since Method available since Release 3.2.1 */ protected function handleConfiguration(array &$arguments) @@ -984,6 +1021,7 @@ protected function handleConfiguration(array &$arguments) /** * @param $extension * @param string $message + * * @since Method available since Release 4.7.3 */ private function showExtensionNotLoadedWarning($extension, $message = '') diff --git a/vendor/phpunit/phpunit/src/Util/Blacklist.php b/vendor/phpunit/phpunit/src/Util/Blacklist.php index 35a053e..a4839ee 100644 --- a/vendor/phpunit/phpunit/src/Util/Blacklist.php +++ b/vendor/phpunit/phpunit/src/Util/Blacklist.php @@ -50,6 +50,7 @@ class PHPUnit_Util_Blacklist /** * @return array + * * @since Method available since Release 4.1.0 */ public function getBlacklistedDirectories() @@ -60,7 +61,8 @@ public function getBlacklistedDirectories() } /** - * @param string $file + * @param string $file + * * @return bool */ public function isBlacklisted($file) diff --git a/vendor/phpunit/phpunit/src/Util/Configuration.php b/vendor/phpunit/phpunit/src/Util/Configuration.php index eab3b65..8e4777d 100644 --- a/vendor/phpunit/phpunit/src/Util/Configuration.php +++ b/vendor/phpunit/phpunit/src/Util/Configuration.php @@ -169,8 +169,10 @@ protected function __construct($filename) /** * Returns a PHPUnit configuration object. * - * @param string $filename + * @param string $filename + * * @return PHPUnit_Util_Configuration + * * @since Method available since Release 3.4.0 */ public static function getInstance($filename) @@ -197,6 +199,7 @@ public static function getInstance($filename) * Returns the realpath to the configuration file. * * @return string + * * @since Method available since Release 3.6.0 */ public function getFilename() @@ -208,6 +211,7 @@ public function getFilename() * Returns the configuration for SUT filtering. * * @return array + * * @since Method available since Release 3.2.1 */ public function getFilterConfiguration() @@ -283,6 +287,7 @@ public function getFilterConfiguration() * Returns the configuration for groups. * * @return array + * * @since Method available since Release 3.2.1 */ public function getGroupConfiguration() @@ -307,6 +312,7 @@ public function getGroupConfiguration() * Returns the configuration for listeners. * * @return array + * * @since Method available since Release 3.4.0 */ public function getListenerConfiguration() @@ -422,6 +428,7 @@ public function getLoggingConfiguration() * Returns the PHP configuration. * * @return array + * * @since Method available since Release 3.2.1 */ public function getPHPConfiguration() @@ -540,6 +547,7 @@ public function handlePHPConfiguration() * Returns the PHPUnit configuration. * * @return array + * * @since Method available since Release 3.2.14 */ public function getPHPUnitConfiguration() @@ -796,6 +804,7 @@ public function getPHPUnitConfiguration() * Returns the SeleniumTestCase browser configuration. * * @return array + * * @since Method available since Release 3.2.9 */ public function getSeleniumBrowserConfiguration() @@ -846,6 +855,7 @@ public function getSeleniumBrowserConfiguration() * Returns the test suite configuration. * * @return PHPUnit_Framework_TestSuite + * * @since Method available since Release 3.2.1 */ public function getTestSuiteConfiguration($testSuiteFilter = null) @@ -874,8 +884,10 @@ public function getTestSuiteConfiguration($testSuiteFilter = null) } /** - * @param DOMElement $testSuiteNode + * @param DOMElement $testSuiteNode + * * @return PHPUnit_Framework_TestSuite + * * @since Method available since Release 3.4.0 */ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter = null) @@ -992,9 +1004,11 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter = nu } /** - * @param string $value - * @param bool $default + * @param string $value + * @param bool $default + * * @return bool + * * @since Method available since Release 3.2.3 */ protected function getBoolean($value, $default) @@ -1009,9 +1023,11 @@ protected function getBoolean($value, $default) } /** - * @param string $value - * @param bool $default + * @param string $value + * @param bool $default + * * @return bool + * * @since Method available since Release 3.6.0 */ protected function getInteger($value, $default) @@ -1024,8 +1040,10 @@ protected function getInteger($value, $default) } /** - * @param string $query + * @param string $query + * * @return array + * * @since Method available since Release 3.2.3 */ protected function readFilterDirectories($query) @@ -1069,8 +1087,10 @@ protected function readFilterDirectories($query) } /** - * @param string $query + * @param string $query + * * @return array + * * @since Method available since Release 3.2.3 */ protected function readFilterFiles($query) @@ -1088,9 +1108,11 @@ protected function readFilterFiles($query) } /** - * @param string $path - * @param bool $useIncludePath + * @param string $path + * @param bool $useIncludePath + * * @return string + * * @since Method available since Release 3.5.0 */ protected function toAbsolutePath($path, $useIncludePath = false) diff --git a/vendor/phpunit/phpunit/src/Util/ErrorHandler.php b/vendor/phpunit/phpunit/src/Util/ErrorHandler.php index 59f274d..d75d1be 100644 --- a/vendor/phpunit/phpunit/src/Util/ErrorHandler.php +++ b/vendor/phpunit/phpunit/src/Util/ErrorHandler.php @@ -36,10 +36,11 @@ public static function getErrorStack() } /** - * @param int $errno - * @param string $errstr - * @param string $errfile - * @param int $errline + * @param int $errno + * @param string $errstr + * @param string $errfile + * @param int $errline + * * @throws PHPUnit_Framework_Error */ public static function handleError($errno, $errstr, $errfile, $errline) @@ -87,7 +88,9 @@ public static function handleError($errno, $errstr, $errfile, $errline) /** * Registers an error handler and returns a function that will restore * the previous handler when invoked - * @param int $severity PHP predefined error constant + * + * @param int $severity PHP predefined error constant + * * @throws Exception if event of specified severity is emitted */ public static function handleErrorOnce($severity = E_WARNING) diff --git a/vendor/phpunit/phpunit/src/Util/Fileloader.php b/vendor/phpunit/phpunit/src/Util/Fileloader.php index adabc9c..7fc787f 100644 --- a/vendor/phpunit/phpunit/src/Util/Fileloader.php +++ b/vendor/phpunit/phpunit/src/Util/Fileloader.php @@ -19,8 +19,10 @@ class PHPUnit_Util_Fileloader * Checks if a PHP sourcefile is readable. * The sourcefile is loaded through the load() method. * - * @param string $filename + * @param string $filename + * * @return string + * * @throws PHPUnit_Framework_Exception */ public static function checkAndLoad($filename) @@ -41,8 +43,10 @@ public static function checkAndLoad($filename) /** * Loads a PHP sourcefile. * - * @param string $filename + * @param string $filename + * * @return mixed + * * @since Method available since Release 3.0.0 */ public static function load($filename) diff --git a/vendor/phpunit/phpunit/src/Util/Filesystem.php b/vendor/phpunit/phpunit/src/Util/Filesystem.php index 3caa5e9..aca601a 100644 --- a/vendor/phpunit/phpunit/src/Util/Filesystem.php +++ b/vendor/phpunit/phpunit/src/Util/Filesystem.php @@ -25,8 +25,10 @@ class PHPUnit_Util_Filesystem * - PEAR CS: Foo_Bar_Baz -> Foo/Bar/Baz.php * - Namespace: Foo\Bar\Baz -> Foo/Bar/Baz.php * - * @param string $className + * @param string $className + * * @return string + * * @since Method available since Release 3.4.0 */ public static function classNameToFilename($className) diff --git a/vendor/phpunit/phpunit/src/Util/Filter.php b/vendor/phpunit/phpunit/src/Util/Filter.php index faf7a5b..8e81b59 100644 --- a/vendor/phpunit/phpunit/src/Util/Filter.php +++ b/vendor/phpunit/phpunit/src/Util/Filter.php @@ -18,8 +18,9 @@ class PHPUnit_Util_Filter /** * Filters stack frames from PHPUnit classes. * - * @param Exception $e - * @param bool $asString + * @param Exception $e + * @param bool $asString + * * @return string */ public static function getFilteredStacktrace(Exception $e, $asString = true) @@ -84,10 +85,12 @@ public static function getFilteredStacktrace(Exception $e, $asString = true) } /** - * @param array $trace - * @param string $file - * @param int $line + * @param array $trace + * @param string $file + * @param int $line + * * @return bool + * * @since Method available since Release 3.3.2 */ private static function frameExists(array $trace, $file, $line) diff --git a/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php b/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php index 0a675fd..80410a8 100644 --- a/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php +++ b/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php @@ -17,9 +17,10 @@ class PHPUnit_Util_InvalidArgumentHelper { /** - * @param int $argument - * @param string $type - * @param mixed $value + * @param int $argument + * @param string $type + * @param mixed $value + * * @return PHPUnit_Framework_Exception */ public static function factory($argument, $type, $value = null) diff --git a/vendor/phpunit/phpunit/src/Util/Log/JSON.php b/vendor/phpunit/phpunit/src/Util/Log/JSON.php index 67f66a8..776bad9 100644 --- a/vendor/phpunit/phpunit/src/Util/Log/JSON.php +++ b/vendor/phpunit/phpunit/src/Util/Log/JSON.php @@ -96,6 +96,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) diff --git a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php index 745be7d..a2e37e5 100644 --- a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php +++ b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php @@ -43,27 +43,27 @@ class PHPUnit_Util_Log_JUnit extends PHPUnit_Util_Printer implements PHPUnit_Fra protected $testSuites = array(); /** - * @var integer[] + * @var int[] */ protected $testSuiteTests = array(0); /** - * @var integer[] + * @var int[] */ protected $testSuiteAssertions = array(0); /** - * @var integer[] + * @var int[] */ protected $testSuiteErrors = array(0); /** - * @var integer[] + * @var int[] */ protected $testSuiteFailures = array(0); /** - * @var integer[] + * @var int[] */ protected $testSuiteTimes = array(0); @@ -217,6 +217,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -246,6 +247,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 3.0.0 */ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -273,6 +275,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time * A testsuite started. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -308,6 +311,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) * A testsuite ended. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function endTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -422,6 +426,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time) * Returns the XML as a string. * * @return string + * * @since Method available since Release 2.2.0 */ public function getXML() @@ -437,6 +442,7 @@ public function getXML() * PHPUnit with Phing. * * @return string + * * @since Method available since Release 2.2.0 */ public function setWriteDocument($flag) diff --git a/vendor/phpunit/phpunit/src/Util/Log/TAP.php b/vendor/phpunit/phpunit/src/Util/Log/TAP.php index 2067bec..bcd587f 100644 --- a/vendor/phpunit/phpunit/src/Util/Log/TAP.php +++ b/vendor/phpunit/phpunit/src/Util/Log/TAP.php @@ -34,8 +34,10 @@ class PHPUnit_Util_Log_TAP extends PHPUnit_Util_Printer implements PHPUnit_Frame /** * Constructor. * - * @param mixed $out + * @param mixed $out + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.3.4 */ public function __construct($out = null) @@ -116,6 +118,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -137,6 +140,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 3.0.0 */ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) diff --git a/vendor/phpunit/phpunit/src/Util/PHP.php b/vendor/phpunit/phpunit/src/Util/PHP.php index 0439b3e..84c2ead 100644 --- a/vendor/phpunit/phpunit/src/Util/PHP.php +++ b/vendor/phpunit/phpunit/src/Util/PHP.php @@ -17,6 +17,7 @@ { /** * @return PHPUnit_Util_PHP + * * @since Method available since Release 3.5.12 */ public static function factory() @@ -31,9 +32,10 @@ public static function factory() /** * Runs a single test in a separate PHP process. * - * @param string $job - * @param PHPUnit_Framework_Test $test - * @param PHPUnit_Framework_TestResult $result + * @param string $job + * @param PHPUnit_Framework_Test $test + * @param PHPUnit_Framework_TestResult $result + * * @throws PHPUnit_Framework_Exception */ public function runTestJob($job, PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result) @@ -53,16 +55,20 @@ public function runTestJob($job, PHPUnit_Framework_Test $test, PHPUnit_Framework /** * Runs a single job (PHP code) using a separate PHP process. * - * @param string $job - * @param array $settings + * @param string $job + * @param array $settings + * * @return array + * * @throws PHPUnit_Framework_Exception */ abstract public function runJob($job, array $settings = array()); /** - * @param array $settings + * @param array $settings + * * @return string + * * @since Method available since Release 4.0.0 */ protected function settingsToParameters(array $settings) @@ -83,6 +89,7 @@ protected function settingsToParameters(array $settings) * @param PHPUnit_Framework_TestResult $result * @param string $stdout * @param string $stderr + * * @since Method available since Release 3.5.0 */ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result, $stdout, $stderr) @@ -184,8 +191,10 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew /** * Gets the thrown exception from a PHPUnit_Framework_TestFailure. * - * @param PHPUnit_Framework_TestFailure $error + * @param PHPUnit_Framework_TestFailure $error + * * @return Exception + * * @since Method available since Release 3.6.0 * @see https://github.com/sebastianbergmann/phpunit/issues/74 */ diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Default.php b/vendor/phpunit/phpunit/src/Util/PHP/Default.php index b8da4c8..f8b5714 100644 --- a/vendor/phpunit/phpunit/src/Util/PHP/Default.php +++ b/vendor/phpunit/phpunit/src/Util/PHP/Default.php @@ -20,9 +20,11 @@ class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP /** * Runs a single job (PHP code) using a separate PHP process. * - * @param string $job - * @param array $settings + * @param string $job + * @param array $settings + * * @return array + * * @throws PHPUnit_Framework_Exception */ public function runJob($job, array $settings = array()) @@ -61,9 +63,11 @@ public function runJob($job, array $settings = array()) } /** - * @param resource $pipe - * @param string $job + * @param resource $pipe + * @param string $job + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.5.12 */ protected function process($pipe, $job) diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Windows.php b/vendor/phpunit/phpunit/src/Util/PHP/Windows.php index 3b1f34a..6587aae 100644 --- a/vendor/phpunit/phpunit/src/Util/PHP/Windows.php +++ b/vendor/phpunit/phpunit/src/Util/PHP/Windows.php @@ -74,9 +74,11 @@ public function runJob($job, array $settings = array()) } /** - * @param resource $pipe - * @param string $job + * @param resource $pipe + * @param string $job + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.5.12 */ protected function process($pipe, $job) diff --git a/vendor/phpunit/phpunit/src/Util/Printer.php b/vendor/phpunit/phpunit/src/Util/Printer.php index 5db309e..9ff7daa 100644 --- a/vendor/phpunit/phpunit/src/Util/Printer.php +++ b/vendor/phpunit/phpunit/src/Util/Printer.php @@ -40,7 +40,8 @@ class PHPUnit_Util_Printer /** * Constructor. * - * @param mixed $out + * @param mixed $out + * * @throws PHPUnit_Framework_Exception */ public function __construct($out = null) @@ -142,6 +143,7 @@ public function write($buffer) * Check auto-flush mode. * * @return bool + * * @since Method available since Release 3.3.0 */ public function getAutoFlush() @@ -156,6 +158,7 @@ public function getAutoFlush() * not be confused with the different effects of this class' flush() method. * * @param bool $autoFlush + * * @since Method available since Release 3.3.0 */ public function setAutoFlush($autoFlush) diff --git a/vendor/phpunit/phpunit/src/Util/String.php b/vendor/phpunit/phpunit/src/Util/String.php index ed952ab..18f8593 100644 --- a/vendor/phpunit/phpunit/src/Util/String.php +++ b/vendor/phpunit/phpunit/src/Util/String.php @@ -18,7 +18,8 @@ class PHPUnit_Util_String /** * Converts a string to UTF-8 encoding. * - * @param string $string + * @param string $string + * * @return string */ public static function convertToUtf8($string) @@ -37,7 +38,8 @@ public static function convertToUtf8($string) /** * Checks a string for UTF-8 encoding. * - * @param string $string + * @param string $string + * * @return bool */ protected static function isUtf8($string) diff --git a/vendor/phpunit/phpunit/src/Util/Test.php b/vendor/phpunit/phpunit/src/Util/Test.php index 583bab9..cef33b3 100644 --- a/vendor/phpunit/phpunit/src/Util/Test.php +++ b/vendor/phpunit/phpunit/src/Util/Test.php @@ -39,8 +39,9 @@ class PHPUnit_Util_Test private static $hookMethods = array(); /** - * @param PHPUnit_Framework_Test $test - * @param bool $asString + * @param PHPUnit_Framework_Test $test + * @param bool $asString + * * @return mixed */ public static function describe(PHPUnit_Framework_Test $test, $asString = true) @@ -65,10 +66,13 @@ public static function describe(PHPUnit_Framework_Test $test, $asString = true) } /** - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array|bool + * * @throws PHPUnit_Framework_CodeCoverageException + * * @since Method available since Release 4.0.0 */ public static function getLinesToBeCovered($className, $methodName) @@ -88,9 +92,11 @@ public static function getLinesToBeCovered($className, $methodName) /** * Returns lines of code specified with the @uses annotation. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 4.0.0 */ public static function getLinesToBeUsed($className, $methodName) @@ -99,11 +105,14 @@ public static function getLinesToBeUsed($className, $methodName) } /** - * @param string $className - * @param string $methodName - * @param string $mode + * @param string $className + * @param string $methodName + * @param string $mode + * * @return array + * * @throws PHPUnit_Framework_CodeCoverageException + * * @since Method available since Release 4.2.0 */ private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode) @@ -162,9 +171,11 @@ private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode /** * Returns the requirements for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 3.6.0 */ public static function getRequirements($className, $methodName) @@ -206,9 +217,11 @@ public static function getRequirements($className, $methodName) /** * Returns the missing requirements for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 4.3.0 */ public static function getMissingRequirements($className, $methodName) @@ -258,9 +271,11 @@ public static function getMissingRequirements($className, $methodName) /** * Returns the expected exception for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 3.3.6 */ public static function getExpectedException($className, $methodName) @@ -323,7 +338,8 @@ public static function getExpectedException($className, $methodName) * * If the constant is not found the string is used as is to ensure maximum BC. * - * @param string $message + * @param string $message + * * @return string */ private static function parseAnnotationContent($message) @@ -340,11 +356,14 @@ private static function parseAnnotationContent($message) /** * Returns the provided data for a method. * - * @param string $className - * @param string $methodName - * @return array|Iterator when a data provider is specified and exists - * null when no data provider is specified + * @param string $className + * @param string $methodName + * + * @return array|Iterator when a data provider is specified and exists + * null when no data provider is specified + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.2.0 */ public static function getProvidedData($className, $methodName) @@ -384,11 +403,13 @@ public static function getProvidedData($className, $methodName) /** * Returns the provided data for a method. * - * @param string $docComment - * @param string $className - * @param string $methodName - * @return array|Iterator when a data provider is specified and exists - * null when no data provider is specified + * @param string $docComment + * @param string $className + * @param string $methodName + * + * @return array|Iterator when a data provider is specified and exists + * null when no data provider is specified + * * @throws PHPUnit_Framework_Exception */ private static function getDataFromDataProviderAnnotation($docComment, $className, $methodName) @@ -432,9 +453,11 @@ private static function getDataFromDataProviderAnnotation($docComment, $classNam } /** - * @param string $docComment full docComment string - * @return array when @testWith annotation is defined - * null when @testWith annotation is omitted + * @param string $docComment full docComment string + * + * @return array when @testWith annotation is defined + * null when @testWith annotation is omitted + * * @throws PHPUnit_Framework_Exception when @testWith annotation is defined but cannot be parsed */ public static function getDataFromTestWithAnnotation($docComment) @@ -472,10 +495,13 @@ private static function cleanUpMultiLineAnnotation($docComment) } /** - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @throws ReflectionException + * * @since Method available since Release 3.4.0 */ public static function parseTestMethodAnnotations($className, $methodName = '') @@ -502,8 +528,10 @@ public static function parseTestMethodAnnotations($className, $methodName = '') } /** - * @param string $docblock + * @param string $docblock + * * @return array + * * @since Method available since Release 3.4.0 */ private static function parseAnnotations($docblock) @@ -526,9 +554,11 @@ private static function parseAnnotations($docblock) /** * Returns the backup settings for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 3.4.0 */ public static function getBackupSettings($className, $methodName) @@ -550,9 +580,11 @@ public static function getBackupSettings($className, $methodName) /** * Returns the dependencies for a test class or method. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 3.4.0 */ public static function getDependencies($className, $methodName) @@ -581,9 +613,11 @@ public static function getDependencies($className, $methodName) /** * Returns the error handler settings for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return bool + * * @since Method available since Release 3.4.0 */ public static function getErrorHandlerSettings($className, $methodName) @@ -598,9 +632,11 @@ public static function getErrorHandlerSettings($className, $methodName) /** * Returns the groups for a test class or method. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 3.2.0 */ public static function getGroups($className, $methodName = '') @@ -654,9 +690,11 @@ public static function getGroups($className, $methodName = '') /** * Returns the size of the test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return int + * * @since Method available since Release 3.6.0 */ public static function getSize($className, $methodName) @@ -683,9 +721,11 @@ public static function getSize($className, $methodName) /** * Returns the tickets for a test class or method. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return array + * * @since Method available since Release 3.4.0 */ public static function getTickets($className, $methodName) @@ -711,9 +751,11 @@ public static function getTickets($className, $methodName) /** * Returns the process isolation settings for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return bool + * * @since Method available since Release 3.4.1 */ public static function getProcessIsolationSettings($className, $methodName) @@ -734,9 +776,11 @@ public static function getProcessIsolationSettings($className, $methodName) /** * Returns the preserve global state settings for a test. * - * @param string $className - * @param string $methodName + * @param string $className + * @param string $methodName + * * @return bool + * * @since Method available since Release 3.4.0 */ public static function getPreserveGlobalStateSettings($className, $methodName) @@ -749,8 +793,10 @@ public static function getPreserveGlobalStateSettings($className, $methodName) } /** - * @param string $className + * @param string $className + * * @return array + * * @since Method available since Release 4.0.8 */ public static function getHookMethods($className) @@ -791,6 +837,7 @@ public static function getHookMethods($className) /** * @return array + * * @since Method available since Release 4.0.9 */ private static function emptyHookMethodsArray() @@ -804,10 +851,12 @@ private static function emptyHookMethodsArray() } /** - * @param string $className - * @param string $methodName - * @param string $settingName + * @param string $className + * @param string $methodName + * @param string $settingName + * * @return bool + * * @since Method available since Release 3.4.0 */ private static function getBooleanAnnotationSetting($className, $methodName, $settingName) @@ -839,9 +888,12 @@ private static function getBooleanAnnotationSetting($className, $methodName, $se } /** - * @param string $element + * @param string $element + * * @return array + * * @throws PHPUnit_Framework_InvalidCoversTargetException + * * @since Method available since Release 4.0.0 */ private static function resolveElementToReflectionObjects($element) @@ -850,7 +902,7 @@ private static function resolveElementToReflectionObjects($element) if (strpos($element, '\\') !== false && function_exists($element)) { $codeToCoverList[] = new ReflectionFunction($element); - } else if (strpos($element, '::') !== false) { + } elseif (strpos($element, '::') !== false) { list($className, $methodName) = explode('::', $element); if (isset($methodName[0]) && $methodName[0] == '<') { @@ -956,7 +1008,8 @@ class_parents($element) } /** - * @param array $reflectors + * @param array $reflectors + * * @return array */ private static function resolveReflectionObjectsToLines(array $reflectors) @@ -982,8 +1035,10 @@ private static function resolveReflectionObjectsToLines(array $reflectors) } /** - * @param ReflectionMethod $method + * @param ReflectionMethod $method + * * @return bool + * * @since Method available since Release 4.0.8 */ private static function isBeforeClassMethod(ReflectionMethod $method) @@ -992,8 +1047,10 @@ private static function isBeforeClassMethod(ReflectionMethod $method) } /** - * @param ReflectionMethod $method + * @param ReflectionMethod $method + * * @return bool + * * @since Method available since Release 4.0.8 */ private static function isBeforeMethod(ReflectionMethod $method) @@ -1002,8 +1059,10 @@ private static function isBeforeMethod(ReflectionMethod $method) } /** - * @param ReflectionMethod $method + * @param ReflectionMethod $method + * * @return bool + * * @since Method available since Release 4.0.8 */ private static function isAfterClassMethod(ReflectionMethod $method) @@ -1012,8 +1071,10 @@ private static function isAfterClassMethod(ReflectionMethod $method) } /** - * @param ReflectionMethod $method + * @param ReflectionMethod $method + * * @return bool + * * @since Method available since Release 4.0.8 */ private static function isAfterMethod(ReflectionMethod $method) diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php b/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php index 45fa898..55a972f 100644 --- a/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php +++ b/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php @@ -33,7 +33,8 @@ class PHPUnit_Util_TestDox_NamePrettifier /** * Prettifies the name of a test class. * - * @param string $name + * @param string $name + * * @return string */ public function prettifyTestClass($name) @@ -60,7 +61,8 @@ public function prettifyTestClass($name) /** * Prettifies the name of a test method. * - * @param string $name + * @param string $name + * * @return string */ public function prettifyTestMethod($name) diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php index fbd7d84..8511c2d 100644 --- a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php +++ b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php @@ -151,6 +151,7 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 4.0.0 */ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -169,6 +170,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) * @param PHPUnit_Framework_Test $test * @param Exception $e * @param float $time + * * @since Method available since Release 3.0.0 */ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) @@ -185,6 +187,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time * A testsuite started. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) @@ -195,6 +198,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) * A testsuite ended. * * @param PHPUnit_Framework_TestSuite $suite + * * @since Method available since Release 2.2.0 */ public function endTestSuite(PHPUnit_Framework_TestSuite $suite) diff --git a/vendor/phpunit/phpunit/src/Util/XML.php b/vendor/phpunit/phpunit/src/Util/XML.php index 552efe2..176204b 100644 --- a/vendor/phpunit/phpunit/src/Util/XML.php +++ b/vendor/phpunit/phpunit/src/Util/XML.php @@ -21,8 +21,10 @@ class PHPUnit_Util_XML * and FFFF (not even as character reference). * See http://www.w3.org/TR/xml/#charsets * - * @param string $string + * @param string $string + * * @return string + * * @since Method available since Release 3.4.6 */ public static function prepareString($string) @@ -41,11 +43,13 @@ public static function prepareString($string) /** * Loads an XML (or HTML) file into a DOMDocument object. * - * @param string $filename - * @param bool $isHtml - * @param bool $xinclude - * @param bool $strict + * @param string $filename + * @param bool $isHtml + * @param bool $xinclude + * @param bool $strict + * * @return DOMDocument + * * @since Method available since Release 3.3.0 */ public static function loadFile($filename, $isHtml = false, $xinclude = false, $strict = false) @@ -80,12 +84,14 @@ public static function loadFile($filename, $isHtml = false, $xinclude = false, $ * not a string as it currently does. To load a file into a * DOMDocument, use loadFile() instead. * - * @param string|DOMDocument $actual - * @param bool $isHtml - * @param string $filename - * @param bool $xinclude - * @param bool $strict + * @param string|DOMDocument $actual + * @param bool $isHtml + * @param string $filename + * @param bool $xinclude + * @param bool $strict + * * @return DOMDocument + * * @since Method available since Release 3.3.0 */ public static function load($actual, $isHtml = false, $filename = '', $xinclude = false, $strict = false) @@ -151,8 +157,10 @@ public static function load($actual, $isHtml = false, $filename = '', $xinclude } /** - * @param DOMNode $node + * @param DOMNode $node + * * @return string + * * @since Method available since Release 3.4.0 */ public static function nodeToText(DOMNode $node) @@ -172,6 +180,7 @@ public static function nodeToText(DOMNode $node) /** * @param DOMNode $node + * * @since Method available since Release 3.3.0 */ public static function removeCharacterDataNodes(DOMNode $node) @@ -188,8 +197,10 @@ public static function removeCharacterDataNodes(DOMNode $node) /** * "Convert" a DOMElement object into a PHP variable. * - * @param DOMElement $element + * @param DOMElement $element + * * @return mixed + * * @since Method available since Release 3.4.0 */ public static function xmlToVariable(DOMElement $element) @@ -256,10 +267,13 @@ public static function xmlToVariable(DOMElement $element) /** * Validate list of keys in the associative array. * - * @param array $hash - * @param array $validKeys + * @param array $hash + * @param array $validKeys + * * @return array + * * @throws PHPUnit_Framework_Exception + * * @since Method available since Release 3.3.0 */ public static function assertValidKeys(array $hash, array $validKeys) @@ -301,9 +315,11 @@ public static function assertValidKeys(array $hash, array $validKeys) * Parse a CSS selector into an associative array suitable for * use with findNodes(). * - * @param string $selector - * @param mixed $content + * @param string $selector + * @param mixed $content + * * @return array + * * @since Method available since Release 3.3.0 */ public static function convertSelectToTag($selector, $content = true) @@ -435,11 +451,13 @@ public static function convertSelectToTag($selector, $content = true) * The $actual document may be a DOMDocument or a string * containing XML or HTML, identified by $isHtml. * - * @param array $selector - * @param string $content - * @param mixed $actual - * @param bool $isHtml + * @param array $selector + * @param string $content + * @param mixed $actual + * @param bool $isHtml + * * @return bool|array + * * @since Method available since Release 3.3.0 */ public static function cssSelect($selector, $content, $actual, $isHtml = true) @@ -454,10 +472,12 @@ public static function cssSelect($selector, $content, $actual, $isHtml = true) /** * Parse out the options from the tag using DOM object tree. * - * @param DOMDocument $dom - * @param array $options - * @param bool $isHtml + * @param DOMDocument $dom + * @param array $options + * @param bool $isHtml + * * @return array + * * @since Method available since Release 3.3.0 */ public static function findNodes(DOMDocument $dom, array $options, $isHtml = true) @@ -836,8 +856,10 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru /** * Recursively get flat array of all descendants of this node. * - * @param DOMNode $node + * @param DOMNode $node + * * @return array + * * @since Method available since Release 3.3.0 */ protected static function getDescendants(DOMNode $node) @@ -861,9 +883,11 @@ protected static function getDescendants(DOMNode $node) /** * Gets elements by case insensitive tagname. * - * @param DOMDocument $dom - * @param string $tag + * @param DOMDocument $dom + * @param string $tag + * * @return DOMNodeList + * * @since Method available since Release 3.4.0 */ protected static function getElementsByCaseInsensitiveTagName(DOMDocument $dom, $tag) @@ -880,8 +904,10 @@ protected static function getElementsByCaseInsensitiveTagName(DOMDocument $dom, /** * Get the text value of this node's child text node. * - * @param DOMNode $node + * @param DOMNode $node + * * @return string + * * @since Method available since Release 3.3.0 */ protected static function getNodeText(DOMNode $node) diff --git a/vendor/sebastian/global-state/.gitignore b/vendor/sebastian/global-state/.gitignore index a288f68..464180e 100644 --- a/vendor/sebastian/global-state/.gitignore +++ b/vendor/sebastian/global-state/.gitignore @@ -3,3 +3,4 @@ composer.lock composer.phar vendor/ cache.properties +phpunit.xml diff --git a/vendor/sebastian/global-state/.travis.yml b/vendor/sebastian/global-state/.travis.yml index 41edae3..0be6154 100644 --- a/vendor/sebastian/global-state/.travis.yml +++ b/vendor/sebastian/global-state/.travis.yml @@ -1,9 +1,5 @@ language: php -before_script: - - composer self-update - - composer install --no-interaction --prefer-source --dev - php: - 5.3.3 - 5.3 @@ -12,8 +8,13 @@ php: - 5.6 - hhvm -script: ./vendor/bin/phpunit --configuration ./build/phpunit.xml +sudo: false + +before_script: + - composer self-update + - composer install --no-interaction --prefer-source --dev + +script: ./vendor/bin/phpunit notifications: email: false - irc: "irc.freenode.org#phpunit" diff --git a/vendor/sebastian/global-state/LICENSE b/vendor/sebastian/global-state/LICENSE index b6176e0..a555bcd 100644 --- a/vendor/sebastian/global-state/LICENSE +++ b/vendor/sebastian/global-state/LICENSE @@ -1,6 +1,6 @@ GlobalState -Copyright (c) 2001-2014, Sebastian Bergmann . +Copyright (c) 2001-2015, Sebastian Bergmann . All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/vendor/sebastian/global-state/README.md b/vendor/sebastian/global-state/README.md index 78fd117..c5e262b 100644 --- a/vendor/sebastian/global-state/README.md +++ b/vendor/sebastian/global-state/README.md @@ -2,6 +2,8 @@ Snapshotting of global state, factored out of PHPUnit into a stand-alone component. +[![Build Status](https://travis-ci.org/sebastianbergmann/global-state.svg?branch=master)](https://travis-ci.org/sebastianbergmann/global-state) + ## Installation To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/global-state` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on GlobalState: diff --git a/vendor/sebastian/global-state/build/phpunit.xml b/vendor/sebastian/global-state/phpunit.xml.dist similarity index 60% rename from vendor/sebastian/global-state/build/phpunit.xml rename to vendor/sebastian/global-state/phpunit.xml.dist index 9fef0a0..d607918 100644 --- a/vendor/sebastian/global-state/build/phpunit.xml +++ b/vendor/sebastian/global-state/phpunit.xml.dist @@ -1,16 +1,21 @@ - ../tests + tests - ../src + src + + + + + diff --git a/vendor/sebastian/global-state/src/Blacklist.php b/vendor/sebastian/global-state/src/Blacklist.php index 12d900f..5d54091 100644 --- a/vendor/sebastian/global-state/src/Blacklist.php +++ b/vendor/sebastian/global-state/src/Blacklist.php @@ -1,43 +1,11 @@ . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. +/* + * This file is part of the GlobalState package. * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. + * (c) Sebastian Bergmann * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ namespace SebastianBergmann\GlobalState; @@ -46,11 +14,6 @@ /** * A blacklist for global state elements that should not be snapshotted. - * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state */ class Blacklist { @@ -139,7 +102,7 @@ public function addStaticAttribute($className, $attributeName) /** * @param string $variableName - * @return boolean + * @return bool */ public function isGlobalVariableBlacklisted($variableName) { @@ -149,7 +112,7 @@ public function isGlobalVariableBlacklisted($variableName) /** * @param string $className * @param string $attributeName - * @return boolean + * @return bool */ public function isStaticAttributeBlacklisted($className, $attributeName) { diff --git a/vendor/sebastian/global-state/src/CodeExporter.php b/vendor/sebastian/global-state/src/CodeExporter.php new file mode 100644 index 0000000..d595c22 --- /dev/null +++ b/vendor/sebastian/global-state/src/CodeExporter.php @@ -0,0 +1,93 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace SebastianBergmann\GlobalState; + +/** + * Exports parts of a Snapshot as PHP code. + */ +class CodeExporter +{ + /** + * @param Snapshot $snapshot + * @return string + */ + public function constants(Snapshot $snapshot) + { + $result = ''; + + foreach ($snapshot->constants() as $name => $value) { + $result .= sprintf( + 'if (!defined(\'%s\')) define(\'%s\', %s);' . "\n", + $name, + $name, + $this->exportVariable($value) + ); + } + + return $result; + } + + /** + * @param Snapshot $snapshot + * @return string + */ + public function iniSettings(Snapshot $snapshot) + { + $result = ''; + + foreach ($snapshot->iniSettings() as $key => $value) { + $result .= sprintf( + '@ini_set(%s, %s);' . "\n", + $this->exportVariable($key), + $this->exportVariable($value) + ); + } + + return $result; + } + + /** + * @param mixed $variable + * @return string + */ + private function exportVariable($variable) + { + if (is_scalar($variable) || is_null($variable) || + (is_array($variable) && $this->arrayOnlyContainsScalars($variable))) { + return var_export($variable, true); + } + + return 'unserialize(' . var_export(serialize($variable), true) . ')'; + } + + /** + * @param array $array + * @return bool + */ + private function arrayOnlyContainsScalars(array $array) + { + $result = true; + + foreach ($array as $element) { + if (is_array($element)) { + $result = self::arrayOnlyContainsScalars($element); + } elseif (!is_scalar($element) && !is_null($element)) { + $result = false; + } + + if ($result === false) { + break; + } + } + + return $result; + } +} diff --git a/vendor/sebastian/global-state/src/Exception.php b/vendor/sebastian/global-state/src/Exception.php index 0436886..1e00212 100644 --- a/vendor/sebastian/global-state/src/Exception.php +++ b/vendor/sebastian/global-state/src/Exception.php @@ -1,52 +1,16 @@ . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. +/* + * This file is part of the GlobalState package. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * (c) Sebastian Bergmann * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ namespace SebastianBergmann\GlobalState; /** - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state */ interface Exception { diff --git a/vendor/sebastian/global-state/src/Restorer.php b/vendor/sebastian/global-state/src/Restorer.php index a5f0e55..78e0ba8 100644 --- a/vendor/sebastian/global-state/src/Restorer.php +++ b/vendor/sebastian/global-state/src/Restorer.php @@ -1,43 +1,11 @@ . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. +/* + * This file is part of the GlobalState package. * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * (c) Sebastian Bergmann * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ namespace SebastianBergmann\GlobalState; @@ -46,18 +14,13 @@ /** * Restorer of snapshots of global state. - * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state */ class Restorer { /** * Deletes function definitions that are not defined in a snapshot. * - * @param Snapshot $snapshot + * @param Snapshot $snapshot * @throws RuntimeException when the uopz_delete() function is not available * @see https://github.com/krakjoe/uopz */ @@ -109,6 +72,10 @@ public function restoreGlobalVariables(Snapshot $snapshot) */ public function restoreStaticAttributes(Snapshot $snapshot) { + $current = new Snapshot($snapshot->blacklist(), false, false, false, false, true, false, false, false, false); + $newClasses = array_diff($current->classes(), $snapshot->classes()); + unset($current); + foreach ($snapshot->staticAttributes() as $className => $staticAttributes) { foreach ($staticAttributes as $name => $value) { $reflector = new ReflectionProperty($className, $name); @@ -116,6 +83,30 @@ public function restoreStaticAttributes(Snapshot $snapshot) $reflector->setValue($value); } } + + foreach ($newClasses as $className) { + $class = new \ReflectionClass($className); + $defaults = $class->getDefaultProperties(); + + foreach ($class->getProperties() as $attribute) { + if (!$attribute->isStatic()) { + continue; + } + + $name = $attribute->getName(); + + if ($snapshot->blacklist()->isStaticAttributeBlacklisted($className, $name)) { + continue; + } + + if (!isset($defaults[$name])) { + continue; + } + + $attribute->setAccessible(true); + $attribute->setValue($defaults[$name]); + } + } } /** diff --git a/vendor/sebastian/global-state/src/RuntimeException.php b/vendor/sebastian/global-state/src/RuntimeException.php index e25e208..c0bf7bd 100644 --- a/vendor/sebastian/global-state/src/RuntimeException.php +++ b/vendor/sebastian/global-state/src/RuntimeException.php @@ -1,52 +1,16 @@ . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. +/* + * This file is part of the GlobalState package. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * (c) Sebastian Bergmann * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ namespace SebastianBergmann\GlobalState; /** - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state */ class RuntimeException extends \RuntimeException implements Exception { diff --git a/vendor/sebastian/global-state/src/Snapshot.php b/vendor/sebastian/global-state/src/Snapshot.php index 5fb08be..3c8aaa9 100644 --- a/vendor/sebastian/global-state/src/Snapshot.php +++ b/vendor/sebastian/global-state/src/Snapshot.php @@ -1,57 +1,20 @@ . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. +/* + * This file is part of the GlobalState package. * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. + * (c) Sebastian Bergmann * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ namespace SebastianBergmann\GlobalState; -use Closure; use ReflectionClass; +use Serializable; /** * A snapshot of global state. - * - * @author Sebastian Bergmann - * @copyright 2001-2014 Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link http://www.github.com/sebastianbergmann/global-state */ class Snapshot { @@ -119,15 +82,15 @@ class Snapshot * Creates a snapshot of the current global state. * * @param Blacklist $blacklist - * @param boolean $includeGlobalVariables - * @param boolean $includeStaticAttributes - * @param boolean $includeConstants - * @param boolean $includeFunctions - * @param boolean $includeClasses - * @param boolean $includeInterfaces - * @param boolean $includeTraits - * @param boolean $includeIniSettings - * @param boolean $includeIncludedFiles + * @param bool $includeGlobalVariables + * @param bool $includeStaticAttributes + * @param bool $includeConstants + * @param bool $includeFunctions + * @param bool $includeClasses + * @param bool $includeInterfaces + * @param bool $includeTraits + * @param bool $includeIniSettings + * @param bool $includeIncludedFiles */ public function __construct(Blacklist $blacklist = null, $includeGlobalVariables = true, $includeStaticAttributes = true, $includeConstants = true, $includeFunctions = true, $includeClasses = true, $includeInterfaces = true, $includeTraits = true, $includeIniSettings = true, $includeIncludedFiles = true) { @@ -434,10 +397,27 @@ private function setupSuperGlobalArrays() /** * @param mixed $variable - * @return boolean + * @return bool * @todo Implement this properly */ - private function canBeSerialized($variable) { - return !$variable instanceof Closure; + private function canBeSerialized($variable) + { + if (!is_object($variable)) { + return !is_resource($variable); + } + + if ($variable instanceof \stdClass) { + return true; + } + + $class = new ReflectionClass($variable); + + do { + if ($class->isInternal()) { + return $variable instanceof Serializable; + } + } while ($class = $class->getParentClass()); + + return true; } } diff --git a/vendor/symfony/browser-kit/composer.json b/vendor/symfony/browser-kit/composer.json index 2313c73..7c0234e 100644 --- a/vendor/symfony/browser-kit/composer.json +++ b/vendor/symfony/browser-kit/composer.json @@ -27,7 +27,10 @@ "symfony/process": "" }, "autoload": { - "psr-4": { "Symfony\\Component\\BrowserKit\\": "" } + "psr-4": { "Symfony\\Component\\BrowserKit\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/class-loader/ClassCollectionLoader.php b/vendor/symfony/class-loader/ClassCollectionLoader.php index c7dc3ae..e33bcbb 100644 --- a/vendor/symfony/class-loader/ClassCollectionLoader.php +++ b/vendor/symfony/class-loader/ClassCollectionLoader.php @@ -137,8 +137,8 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = public static function fixNamespaceDeclarations($source) { if (!function_exists('token_get_all') || !self::$useTokenizer) { - if (preg_match('/namespace(.*?)\s*;/', $source)) { - $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n"; + if (preg_match('/(^|\s)namespace(.*?)\s*;/', $source)) { + $source = preg_replace('/(^|\s)namespace(.*?)\s*;/', "$1namespace$2\n{", $source)."}\n"; } return $source; diff --git a/vendor/symfony/class-loader/composer.json b/vendor/symfony/class-loader/composer.json index 828e598..c7322c7 100644 --- a/vendor/symfony/class-loader/composer.json +++ b/vendor/symfony/class-loader/composer.json @@ -20,14 +20,17 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/finder": "~2.0,>=2.0.5" + "symfony/finder": "~2.0,>=2.0.5|~3.0.0" }, "autoload": { - "psr-4": { "Symfony\\Component\\ClassLoader\\": "" } + "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php index e386337..a425fe8 100644 --- a/vendor/symfony/console/Application.php +++ b/vendor/symfony/console/Application.php @@ -13,6 +13,7 @@ use Symfony\Component\Console\Descriptor\TextDescriptor; use Symfony\Component\Console\Descriptor\XmlDescriptor; +use Symfony\Component\Console\Exception\ExceptionInterface; use Symfony\Component\Console\Helper\DebugFormatterHelper; use Symfony\Component\Console\Helper\ProcessHelper; use Symfony\Component\Console\Helper\QuestionHelper; @@ -38,6 +39,8 @@ use Symfony\Component\Console\Event\ConsoleCommandEvent; use Symfony\Component\Console\Event\ConsoleExceptionEvent; use Symfony\Component\Console\Event\ConsoleTerminateEvent; +use Symfony\Component\Console\Exception\CommandNotFoundException; +use Symfony\Component\Console\Exception\LogicException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** @@ -360,7 +363,7 @@ public function add(Command $command) } if (null === $command->getDefinition()) { - throw new \LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command))); + throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command))); } $this->commands[$command->getName()] = $command; @@ -379,12 +382,12 @@ public function add(Command $command) * * @return Command A Command object * - * @throws \InvalidArgumentException When command name given does not exist + * @throws CommandNotFoundException When command name given does not exist */ public function get($name) { if (!isset($this->commands[$name])) { - throw new \InvalidArgumentException(sprintf('The command "%s" does not exist.', $name)); + throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name)); } $command = $this->commands[$name]; @@ -441,7 +444,7 @@ public function getNamespaces() * * @return string A registered namespace * - * @throws \InvalidArgumentException When namespace is incorrect or ambiguous + * @throws CommandNotFoundException When namespace is incorrect or ambiguous */ public function findNamespace($namespace) { @@ -462,12 +465,12 @@ public function findNamespace($namespace) $message .= implode("\n ", $alternatives); } - throw new \InvalidArgumentException($message); + throw new CommandNotFoundException($message, $alternatives); } $exact = in_array($namespace, $namespaces, true); if (count($namespaces) > 1 && !$exact) { - throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces)))); + throw new CommandNotFoundException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces)); } return $exact ? $namespace : reset($namespaces); @@ -483,7 +486,7 @@ public function findNamespace($namespace) * * @return Command A Command instance * - * @throws \InvalidArgumentException When command name is incorrect or ambiguous + * @throws CommandNotFoundException When command name is incorrect or ambiguous */ public function find($name) { @@ -508,7 +511,7 @@ public function find($name) $message .= implode("\n ", $alternatives); } - throw new \InvalidArgumentException($message); + throw new CommandNotFoundException($message, $alternatives); } // filter out aliases for commands which are already on the list @@ -525,7 +528,7 @@ public function find($name) if (count($commands) > 1 && !$exact) { $suggestions = $this->getAbbreviationSuggestions(array_values($commands)); - throw new \InvalidArgumentException(sprintf('Command "%s" is ambiguous (%s).', $name, $suggestions)); + throw new CommandNotFoundException(sprintf('Command "%s" is ambiguous (%s).', $name, $suggestions), array_values($commands)); } return $this->get($exact ? $name : reset($commands)); @@ -663,10 +666,10 @@ public function renderException($e, $output) $messages[] = ''; $messages[] = ''; - $output->writeln($messages, OutputInterface::OUTPUT_RAW); + $output->writeln($messages, OutputInterface::OUTPUT_RAW | OutputInterface::VERBOSITY_QUIET); if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) { - $output->writeln('Exception trace:'); + $output->writeln('Exception trace:', OutputInterface::VERBOSITY_QUIET); // exception related properties $trace = $e->getTrace(); @@ -684,18 +687,18 @@ public function renderException($e, $output) $file = isset($trace[$i]['file']) ? $trace[$i]['file'] : 'n/a'; $line = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a'; - $output->writeln(sprintf(' %s%s%s() at %s:%s', $class, $type, $function, $file, $line)); + $output->writeln(sprintf(' %s%s%s() at %s:%s', $class, $type, $function, $file, $line), OutputInterface::VERBOSITY_QUIET); } - $output->writeln(''); - $output->writeln(''); + $output->writeln('', OutputInterface::VERBOSITY_QUIET); + $output->writeln('', OutputInterface::VERBOSITY_QUIET); } } while ($e = $e->getPrevious()); if (null !== $this->runningCommand) { - $output->writeln(sprintf('%s', sprintf($this->runningCommand->getSynopsis(), $this->getName()))); - $output->writeln(''); - $output->writeln(''); + $output->writeln(sprintf('%s', sprintf($this->runningCommand->getSynopsis(), $this->getName())), OutputInterface::VERBOSITY_QUIET); + $output->writeln('', OutputInterface::VERBOSITY_QUIET); + $output->writeln('', OutputInterface::VERBOSITY_QUIET); } } @@ -838,6 +841,14 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI return $command->run($input, $output); } + // bind before the console.command event, so the listeners have access to input options/arguments + try { + $command->mergeApplicationDefinition(); + $input->bind($command->getDefinition()); + } catch (ExceptionInterface $e) { + // ignore invalid options/arguments for now, to allow the event listeners to customize the InputDefinition + } + $event = new ConsoleCommandEvent($command, $input, $output); $this->dispatcher->dispatch(ConsoleEvents::COMMAND, $event); @@ -1066,11 +1077,7 @@ public function setDefaultCommand($commandName) private function stringWidth($string) { - if (!function_exists('mb_strwidth')) { - return strlen($string); - } - - if (false === $encoding = mb_detect_encoding($string)) { + if (false === $encoding = mb_detect_encoding($string, null, true)) { return strlen($string); } @@ -1082,12 +1089,7 @@ private function splitStringByWidth($string, $width) // str_split is not suitable for multi-byte characters, we should use preg_split to get char array properly. // additionally, array_slice() is not enough as some character has doubled width. // we need a function to split string not by character count but by string width - - if (!function_exists('mb_strwidth')) { - return str_split($string, $width); - } - - if (false === $encoding = mb_detect_encoding($string)) { + if (false === $encoding = mb_detect_encoding($string, null, true)) { return str_split($string, $width); } diff --git a/vendor/symfony/console/CHANGELOG.md b/vendor/symfony/console/CHANGELOG.md index 07254c6..4e29d2e 100644 --- a/vendor/symfony/console/CHANGELOG.md +++ b/vendor/symfony/console/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +2.8.0 +----- + + * use readline for user input in the question helper when available to allow + the use of arrow keys + 2.6.0 ----- diff --git a/vendor/symfony/console/Command/Command.php b/vendor/symfony/console/Command/Command.php index 51a8a39..0522068 100644 --- a/vendor/symfony/console/Command/Command.php +++ b/vendor/symfony/console/Command/Command.php @@ -13,6 +13,7 @@ use Symfony\Component\Console\Descriptor\TextDescriptor; use Symfony\Component\Console\Descriptor\XmlDescriptor; +use Symfony\Component\Console\Exception\ExceptionInterface; use Symfony\Component\Console\Input\InputDefinition; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputArgument; @@ -21,6 +22,8 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Application; use Symfony\Component\Console\Helper\HelperSet; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\LogicException; /** * Base class for all commands. @@ -49,7 +52,7 @@ class Command * * @param string|null $name The name of the command; passing null means it must be set in configure() * - * @throws \LogicException When the command name is empty + * @throws LogicException When the command name is empty */ public function __construct($name = null) { @@ -62,7 +65,7 @@ public function __construct($name = null) $this->configure(); if (!$this->name) { - throw new \LogicException(sprintf('The command defined in "%s" cannot have an empty name.', get_class($this))); + throw new LogicException(sprintf('The command defined in "%s" cannot have an empty name.', get_class($this))); } } @@ -154,13 +157,13 @@ protected function configure() * * @return null|int null or 0 if everything went fine, or an error code * - * @throws \LogicException When this abstract method is not implemented + * @throws LogicException When this abstract method is not implemented * * @see setCode() */ protected function execute(InputInterface $input, OutputInterface $output) { - throw new \LogicException('You must override the execute() method in the concrete command class.'); + throw new LogicException('You must override the execute() method in the concrete command class.'); } /** @@ -219,7 +222,7 @@ public function run(InputInterface $input, OutputInterface $output) // bind the input against the command specific arguments/options try { $input->bind($this->definition); - } catch (\Exception $e) { + } catch (ExceptionInterface $e) { if (!$this->ignoreValidationErrors) { throw $e; } @@ -269,14 +272,21 @@ public function run(InputInterface $input, OutputInterface $output) * * @return Command The current instance * - * @throws \InvalidArgumentException + * @throws InvalidArgumentException * * @see execute() */ public function setCode($code) { if (!is_callable($code)) { - throw new \InvalidArgumentException('Invalid callable provided to Command::setCode.'); + throw new InvalidArgumentException('Invalid callable provided to Command::setCode.'); + } + + if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) { + $r = new \ReflectionFunction($code); + if (null === $r->getClosureThis()) { + $code = \Closure::bind($code, $this); + } } $this->code = $code; @@ -403,7 +413,7 @@ public function addOption($name, $shortcut = null, $mode = null, $description = * * @return Command The current instance * - * @throws \InvalidArgumentException When the name is invalid + * @throws InvalidArgumentException When the name is invalid */ public function setName($name) { @@ -520,12 +530,12 @@ public function getProcessedHelp() * * @return Command The current instance * - * @throws \InvalidArgumentException When an alias is invalid + * @throws InvalidArgumentException When an alias is invalid */ public function setAliases($aliases) { if (!is_array($aliases) && !$aliases instanceof \Traversable) { - throw new \InvalidArgumentException('$aliases must be an array or an instance of \Traversable'); + throw new InvalidArgumentException('$aliases must be an array or an instance of \Traversable'); } foreach ($aliases as $alias) { @@ -598,7 +608,7 @@ public function getUsages() * * @return mixed The helper value * - * @throws \InvalidArgumentException if the helper is not defined + * @throws InvalidArgumentException if the helper is not defined */ public function getHelper($name) { @@ -655,12 +665,12 @@ public function asXml($asDom = false) * * @param string $name * - * @throws \InvalidArgumentException When the name is invalid + * @throws InvalidArgumentException When the name is invalid */ private function validateName($name) { if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) { - throw new \InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name)); + throw new InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name)); } } } diff --git a/vendor/symfony/console/Descriptor/ApplicationDescription.php b/vendor/symfony/console/Descriptor/ApplicationDescription.php index 0e87193..89961b9 100644 --- a/vendor/symfony/console/Descriptor/ApplicationDescription.php +++ b/vendor/symfony/console/Descriptor/ApplicationDescription.php @@ -13,6 +13,7 @@ use Symfony\Component\Console\Application; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Exception\CommandNotFoundException; /** * @author Jean-François Simon @@ -89,12 +90,12 @@ public function getCommands() * * @return Command * - * @throws \InvalidArgumentException + * @throws CommandNotFoundException */ public function getCommand($name) { if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) { - throw new \InvalidArgumentException(sprintf('Command %s does not exist.', $name)); + throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name)); } return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name]; diff --git a/vendor/symfony/console/Descriptor/Descriptor.php b/vendor/symfony/console/Descriptor/Descriptor.php index 49e2193..43a7a0a 100644 --- a/vendor/symfony/console/Descriptor/Descriptor.php +++ b/vendor/symfony/console/Descriptor/Descriptor.php @@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputDefinition; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Exception\InvalidArgumentException; /** * @author Jean-François Simon @@ -54,7 +55,7 @@ public function describe(OutputInterface $output, $object, array $options = arra $this->describeApplication($object, $options); break; default: - throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object))); + throw new InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object))); } } diff --git a/vendor/symfony/console/Descriptor/TextDescriptor.php b/vendor/symfony/console/Descriptor/TextDescriptor.php index 57e09e4..f2895bd 100644 --- a/vendor/symfony/console/Descriptor/TextDescriptor.php +++ b/vendor/symfony/console/Descriptor/TextDescriptor.php @@ -236,10 +236,10 @@ private function writeText($content, array $options = array()) private function formatDefaultValue($default) { if (PHP_VERSION_ID < 50400) { - return str_replace('\/', '/', json_encode($default)); + return str_replace(array('\/', '\\\\'), array('/', '\\'), json_encode($default)); } - return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); + return str_replace('\\\\', '\\', json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); } /** diff --git a/vendor/symfony/console/Exception/CommandNotFoundException.php b/vendor/symfony/console/Exception/CommandNotFoundException.php new file mode 100644 index 0000000..ce6fefe --- /dev/null +++ b/vendor/symfony/console/Exception/CommandNotFoundException.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * Represents an incorrect command name typed in the console. + * + * @author Jérôme Tamarelle + */ +class CommandNotFoundException extends \InvalidArgumentException implements ExceptionInterface +{ + private $alternatives; + + /** + * @param string $message Exception message to throw. + * @param array $alternatives List of similar defined names. + * @param int $code Exception code. + * @param Exception $previous previous exception used for the exception chaining. + */ + public function __construct($message, array $alternatives = array(), $code = 0, \Exception $previous = null) + { + parent::__construct($message, $code, $previous); + + $this->alternatives = $alternatives; + } + + /** + * @return array A list of similar defined names. + */ + public function getAlternatives() + { + return $this->alternatives; + } +} diff --git a/vendor/symfony/console/Exception/ExceptionInterface.php b/vendor/symfony/console/Exception/ExceptionInterface.php new file mode 100644 index 0000000..491cc4c --- /dev/null +++ b/vendor/symfony/console/Exception/ExceptionInterface.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * ExceptionInterface. + * + * @author Jérôme Tamarelle + */ +interface ExceptionInterface +{ +} diff --git a/vendor/symfony/console/Exception/InvalidArgumentException.php b/vendor/symfony/console/Exception/InvalidArgumentException.php new file mode 100644 index 0000000..07cc0b6 --- /dev/null +++ b/vendor/symfony/console/Exception/InvalidArgumentException.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * @author Jérôme Tamarelle + */ +class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface +{ +} diff --git a/vendor/symfony/console/Exception/InvalidOptionException.php b/vendor/symfony/console/Exception/InvalidOptionException.php new file mode 100644 index 0000000..b2eec61 --- /dev/null +++ b/vendor/symfony/console/Exception/InvalidOptionException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * Represents an incorrect option name typed in the console. + * + * @author Jérôme Tamarelle + */ +class InvalidOptionException extends \InvalidArgumentException implements ExceptionInterface +{ +} diff --git a/vendor/symfony/console/Exception/LogicException.php b/vendor/symfony/console/Exception/LogicException.php new file mode 100644 index 0000000..fc37b8d --- /dev/null +++ b/vendor/symfony/console/Exception/LogicException.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * @author Jérôme Tamarelle + */ +class LogicException extends \LogicException implements ExceptionInterface +{ +} diff --git a/vendor/symfony/console/Exception/RuntimeException.php b/vendor/symfony/console/Exception/RuntimeException.php new file mode 100644 index 0000000..51d7d80 --- /dev/null +++ b/vendor/symfony/console/Exception/RuntimeException.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * @author Jérôme Tamarelle + */ +class RuntimeException extends \RuntimeException implements ExceptionInterface +{ +} diff --git a/vendor/symfony/console/Formatter/OutputFormatter.php b/vendor/symfony/console/Formatter/OutputFormatter.php index 7a78eb2..244e25c 100644 --- a/vendor/symfony/console/Formatter/OutputFormatter.php +++ b/vendor/symfony/console/Formatter/OutputFormatter.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Formatter; +use Symfony\Component\Console\Exception\InvalidArgumentException; + /** * Formatter class for console output. * @@ -106,12 +108,12 @@ public function hasStyle($name) * * @return OutputFormatterStyleInterface * - * @throws \InvalidArgumentException When style isn't defined + * @throws InvalidArgumentException When style isn't defined */ public function getStyle($name) { if (!$this->hasStyle($name)) { - throw new \InvalidArgumentException(sprintf('Undefined style: %s', $name)); + throw new InvalidArgumentException(sprintf('Undefined style: %s', $name)); } return $this->styles[strtolower($name)]; diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyle.php b/vendor/symfony/console/Formatter/OutputFormatterStyle.php index 4d3eda3..c7c6b4a 100644 --- a/vendor/symfony/console/Formatter/OutputFormatterStyle.php +++ b/vendor/symfony/console/Formatter/OutputFormatterStyle.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Formatter; +use Symfony\Component\Console\Exception\InvalidArgumentException; + /** * Formatter style class for defining styles. * @@ -77,7 +79,7 @@ public function __construct($foreground = null, $background = null, array $optio * * @param string|null $color The color name * - * @throws \InvalidArgumentException When the color name isn't defined + * @throws InvalidArgumentException When the color name isn't defined */ public function setForeground($color = null) { @@ -88,7 +90,7 @@ public function setForeground($color = null) } if (!isset(static::$availableForegroundColors[$color])) { - throw new \InvalidArgumentException(sprintf( + throw new InvalidArgumentException(sprintf( 'Invalid foreground color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableForegroundColors)) @@ -103,7 +105,7 @@ public function setForeground($color = null) * * @param string|null $color The color name * - * @throws \InvalidArgumentException When the color name isn't defined + * @throws InvalidArgumentException When the color name isn't defined */ public function setBackground($color = null) { @@ -114,7 +116,7 @@ public function setBackground($color = null) } if (!isset(static::$availableBackgroundColors[$color])) { - throw new \InvalidArgumentException(sprintf( + throw new InvalidArgumentException(sprintf( 'Invalid background color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableBackgroundColors)) @@ -129,12 +131,12 @@ public function setBackground($color = null) * * @param string $option The option name * - * @throws \InvalidArgumentException When the option name isn't defined + * @throws InvalidArgumentException When the option name isn't defined */ public function setOption($option) { if (!isset(static::$availableOptions[$option])) { - throw new \InvalidArgumentException(sprintf( + throw new InvalidArgumentException(sprintf( 'Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions)) @@ -151,12 +153,12 @@ public function setOption($option) * * @param string $option The option name * - * @throws \InvalidArgumentException When the option name isn't defined + * @throws InvalidArgumentException When the option name isn't defined */ public function unsetOption($option) { if (!isset(static::$availableOptions[$option])) { - throw new \InvalidArgumentException(sprintf( + throw new InvalidArgumentException(sprintf( 'Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions)) diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php b/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php index b64c87f..e5d14ea 100644 --- a/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php +++ b/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Formatter; +use Symfony\Component\Console\Exception\InvalidArgumentException; + /** * @author Jean-François Simon */ @@ -62,7 +64,7 @@ public function push(OutputFormatterStyleInterface $style) * * @return OutputFormatterStyleInterface * - * @throws \InvalidArgumentException When style tags incorrectly nested + * @throws InvalidArgumentException When style tags incorrectly nested */ public function pop(OutputFormatterStyleInterface $style = null) { @@ -82,7 +84,7 @@ public function pop(OutputFormatterStyleInterface $style = null) } } - throw new \InvalidArgumentException('Incorrectly nested style tag found.'); + throw new InvalidArgumentException('Incorrectly nested style tag found.'); } /** diff --git a/vendor/symfony/console/Helper/DescriptorHelper.php b/vendor/symfony/console/Helper/DescriptorHelper.php index c324c99..a53b476 100644 --- a/vendor/symfony/console/Helper/DescriptorHelper.php +++ b/vendor/symfony/console/Helper/DescriptorHelper.php @@ -17,6 +17,7 @@ use Symfony\Component\Console\Descriptor\TextDescriptor; use Symfony\Component\Console\Descriptor\XmlDescriptor; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Exception\InvalidArgumentException; /** * This class adds helper method to describe objects in various formats. @@ -54,7 +55,7 @@ public function __construct() * @param object $object * @param array $options * - * @throws \InvalidArgumentException when the given format is not supported + * @throws InvalidArgumentException when the given format is not supported */ public function describe(OutputInterface $output, $object, array $options = array()) { @@ -64,7 +65,7 @@ public function describe(OutputInterface $output, $object, array $options = arra ), $options); if (!isset($this->descriptors[$options['format']])) { - throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format'])); + throw new InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format'])); } $descriptor = $this->descriptors[$options['format']]; diff --git a/vendor/symfony/console/Helper/DialogHelper.php b/vendor/symfony/console/Helper/DialogHelper.php index dbadac2..1c1d247 100644 --- a/vendor/symfony/console/Helper/DialogHelper.php +++ b/vendor/symfony/console/Helper/DialogHelper.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Helper; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Formatter\OutputFormatterStyle; @@ -48,7 +50,7 @@ public function __construct($triggerDeprecationError = true) * * @return int|string|array The selected value or values (the key of the choices array) * - * @throws \InvalidArgumentException + * @throws InvalidArgumentException */ public function select(OutputInterface $output, $question, $choices, $default = null, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false) { @@ -68,7 +70,7 @@ public function select(OutputInterface $output, $question, $choices, $default = if ($multiselect) { // Check for a separated comma values if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) { - throw new \InvalidArgumentException(sprintf($errorMessage, $picked)); + throw new InvalidArgumentException(sprintf($errorMessage, $picked)); } $selectedChoices = explode(',', $selectedChoices); } else { @@ -79,7 +81,7 @@ public function select(OutputInterface $output, $question, $choices, $default = foreach ($selectedChoices as $value) { if (empty($choices[$value])) { - throw new \InvalidArgumentException(sprintf($errorMessage, $value)); + throw new InvalidArgumentException(sprintf($errorMessage, $value)); } $multiselectChoices[] = $value; } @@ -104,7 +106,7 @@ public function select(OutputInterface $output, $question, $choices, $default = * * @return string The user answer * - * @throws \RuntimeException If there is no data to read in the input stream + * @throws RuntimeException If there is no data to read in the input stream */ public function ask(OutputInterface $output, $question, $default = null, array $autocomplete = null) { @@ -119,7 +121,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $ if (null === $autocomplete || !$this->hasSttyAvailable()) { $ret = fgets($inputStream, 4096); if (false === $ret) { - throw new \RuntimeException('Aborted'); + throw new RuntimeException('Aborted'); } $ret = trim($ret); } else { @@ -265,7 +267,7 @@ public function askConfirmation(OutputInterface $output, $question, $default = t * * @return string The answer * - * @throws \RuntimeException In case the fallback is deactivated and the response can not be hidden + * @throws RuntimeException In case the fallback is deactivated and the response can not be hidden */ public function askHiddenResponse(OutputInterface $output, $question, $fallback = true) { @@ -300,7 +302,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback shell_exec(sprintf('stty %s', $sttyMode)); if (false === $value) { - throw new \RuntimeException('Aborted'); + throw new RuntimeException('Aborted'); } $value = trim($value); @@ -323,7 +325,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback return $this->ask($output, $question); } - throw new \RuntimeException('Unable to hide the response'); + throw new RuntimeException('Unable to hide the response'); } /** @@ -370,8 +372,8 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $ * * @return string The response * - * @throws \Exception When any of the validators return an error - * @throws \RuntimeException In case the fallback is deactivated and the response can not be hidden + * @throws \Exception When any of the validators return an error + * @throws RuntimeException In case the fallback is deactivated and the response can not be hidden */ public function askHiddenResponseAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $fallback = true) { diff --git a/vendor/symfony/console/Helper/Helper.php b/vendor/symfony/console/Helper/Helper.php index b288d44..b542be3 100644 --- a/vendor/symfony/console/Helper/Helper.php +++ b/vendor/symfony/console/Helper/Helper.php @@ -51,11 +51,7 @@ public function getHelperSet() */ public static function strlen($string) { - if (!function_exists('mb_strwidth')) { - return strlen($string); - } - - if (false === $encoding = mb_detect_encoding($string)) { + if (false === $encoding = mb_detect_encoding($string, null, true)) { return strlen($string); } diff --git a/vendor/symfony/console/Helper/HelperSet.php b/vendor/symfony/console/Helper/HelperSet.php index 00354dd..27fedcf 100644 --- a/vendor/symfony/console/Helper/HelperSet.php +++ b/vendor/symfony/console/Helper/HelperSet.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Console\Helper; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Exception\InvalidArgumentException; /** * HelperSet represents a set of helpers to be used with a command. @@ -70,12 +71,12 @@ public function has($name) * * @return HelperInterface The helper instance * - * @throws \InvalidArgumentException if the helper is not defined + * @throws InvalidArgumentException if the helper is not defined */ public function get($name) { if (!$this->has($name)) { - throw new \InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name)); + throw new InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name)); } if ('dialog' === $name && $this->helpers[$name] instanceof DialogHelper) { diff --git a/vendor/symfony/console/Helper/ProgressBar.php b/vendor/symfony/console/Helper/ProgressBar.php index 0b64b18..b443013 100644 --- a/vendor/symfony/console/Helper/ProgressBar.php +++ b/vendor/symfony/console/Helper/ProgressBar.php @@ -13,6 +13,7 @@ use Symfony\Component\Console\Output\ConsoleOutputInterface; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Exception\LogicException; /** * The ProgressBar provides helpers to display progress output. @@ -346,7 +347,7 @@ public function start($max = null) * * @param int $step Number of steps to advance * - * @throws \LogicException + * @throws LogicException */ public function advance($step = 1) { @@ -360,7 +361,7 @@ public function advance($step = 1) * * @param int $step The current progress * - * @throws \LogicException + * @throws LogicException */ public function setCurrent($step) { @@ -384,13 +385,13 @@ public function setOverwrite($overwrite) * * @param int $step The current progress * - * @throws \LogicException + * @throws LogicException */ public function setProgress($step) { $step = (int) $step; if ($step < $this->step) { - throw new \LogicException('You can\'t regress the progress bar.'); + throw new LogicException('You can\'t regress the progress bar.'); } if ($this->max && $step > $this->max) { @@ -580,7 +581,7 @@ private static function initPlaceholderFormatters() }, 'remaining' => function (ProgressBar $bar) { if (!$bar->getMaxSteps()) { - throw new \LogicException('Unable to display the remaining time if the maximum number of steps is not set.'); + throw new LogicException('Unable to display the remaining time if the maximum number of steps is not set.'); } if (!$bar->getProgress()) { @@ -593,7 +594,7 @@ private static function initPlaceholderFormatters() }, 'estimated' => function (ProgressBar $bar) { if (!$bar->getMaxSteps()) { - throw new \LogicException('Unable to display the estimated time if the maximum number of steps is not set.'); + throw new LogicException('Unable to display the estimated time if the maximum number of steps is not set.'); } if (!$bar->getProgress()) { diff --git a/vendor/symfony/console/Helper/ProgressHelper.php b/vendor/symfony/console/Helper/ProgressHelper.php index bd88566..e92f24c 100644 --- a/vendor/symfony/console/Helper/ProgressHelper.php +++ b/vendor/symfony/console/Helper/ProgressHelper.php @@ -13,6 +13,7 @@ use Symfony\Component\Console\Output\NullOutput; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Exception\LogicException; /** * The Progress class provides helpers to display progress output. @@ -236,7 +237,7 @@ public function start(OutputInterface $output, $max = null) * @param int $step Number of steps to advance * @param bool $redraw Whether to redraw or not * - * @throws \LogicException + * @throws LogicException */ public function advance($step = 1, $redraw = false) { @@ -249,18 +250,18 @@ public function advance($step = 1, $redraw = false) * @param int $current The current progress * @param bool $redraw Whether to redraw or not * - * @throws \LogicException + * @throws LogicException */ public function setCurrent($current, $redraw = false) { if (null === $this->startTime) { - throw new \LogicException('You must start the progress bar before calling setCurrent().'); + throw new LogicException('You must start the progress bar before calling setCurrent().'); } $current = (int) $current; if ($current < $this->current) { - throw new \LogicException('You can\'t regress the progress bar'); + throw new LogicException('You can\'t regress the progress bar'); } if (0 === $this->current) { @@ -282,12 +283,12 @@ public function setCurrent($current, $redraw = false) * * @param bool $finish Forces the end result * - * @throws \LogicException + * @throws LogicException */ public function display($finish = false) { if (null === $this->startTime) { - throw new \LogicException('You must start the progress bar before calling display().'); + throw new LogicException('You must start the progress bar before calling display().'); } $message = $this->format; @@ -315,7 +316,7 @@ public function clear() public function finish() { if (null === $this->startTime) { - throw new \LogicException('You must start the progress bar before calling finish().'); + throw new LogicException('You must start the progress bar before calling finish().'); } if (null !== $this->startTime) { diff --git a/vendor/symfony/console/Helper/ProgressIndicator.php b/vendor/symfony/console/Helper/ProgressIndicator.php new file mode 100644 index 0000000..8c8a49c --- /dev/null +++ b/vendor/symfony/console/Helper/ProgressIndicator.php @@ -0,0 +1,322 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Helper; + +use Symfony\Component\Console\Output\OutputInterface; + +/** + * @author Kevin Bond + */ +class ProgressIndicator +{ + private $output; + private $startTime; + private $format; + private $message; + private $indicatorValues; + private $indicatorCurrent; + private $indicatorChangeInterval; + private $indicatorUpdateTime; + private $lastMessagesLength; + private $started = false; + + private static $formatters; + private static $formats; + + /** + * @param OutputInterface $output + * @param string|null $format Indicator format + * @param int $indicatorChangeInterval Change interval in milliseconds + * @param array|null $indicatorValues Animated indicator characters + */ + public function __construct(OutputInterface $output, $format = null, $indicatorChangeInterval = 100, $indicatorValues = null) + { + $this->output = $output; + + if (null === $format) { + $format = $this->determineBestFormat(); + } + + if (null === $indicatorValues) { + $indicatorValues = array('-', '\\', '|', '/'); + } + + $indicatorValues = array_values($indicatorValues); + + if (2 > count($indicatorValues)) { + throw new \InvalidArgumentException('Must have at least 2 indicator value characters.'); + } + + $this->format = self::getFormatDefinition($format); + $this->indicatorChangeInterval = $indicatorChangeInterval; + $this->indicatorValues = $indicatorValues; + $this->startTime = time(); + } + + /** + * Sets the current indicator message. + * + * @param string|null $message + */ + public function setMessage($message) + { + $this->message = $message; + + $this->display(); + } + + /** + * Gets the current indicator message. + * + * @return string|null + * + * @internal for PHP 5.3 compatibility + */ + public function getMessage() + { + return $this->message; + } + + /** + * Gets the progress bar start time. + * + * @return int The progress bar start time + * + * @internal for PHP 5.3 compatibility + */ + public function getStartTime() + { + return $this->startTime; + } + + /** + * Gets the current animated indicator character. + * + * @return string + * + * @internal for PHP 5.3 compatibility + */ + public function getCurrentValue() + { + return $this->indicatorValues[$this->indicatorCurrent % count($this->indicatorValues)]; + } + + /** + * Starts the indicator output. + * + * @param $message + */ + public function start($message) + { + if ($this->started) { + throw new \LogicException('Progress indicator already started.'); + } + + $this->message = $message; + $this->started = true; + $this->lastMessagesLength = 0; + $this->startTime = time(); + $this->indicatorUpdateTime = $this->getCurrentTimeInMilliseconds() + $this->indicatorChangeInterval; + $this->indicatorCurrent = 0; + + $this->display(); + } + + /** + * Advances the indicator. + */ + public function advance() + { + if (!$this->started) { + throw new \LogicException('Progress indicator has not yet been started.'); + } + + if (!$this->output->isDecorated()) { + return; + } + + $currentTime = $this->getCurrentTimeInMilliseconds(); + + if ($currentTime < $this->indicatorUpdateTime) { + return; + } + + $this->indicatorUpdateTime = $currentTime + $this->indicatorChangeInterval; + ++$this->indicatorCurrent; + + $this->display(); + } + + /** + * Finish the indicator with message. + * + * @param $message + */ + public function finish($message) + { + if (!$this->started) { + throw new \LogicException('Progress indicator has not yet been started.'); + } + + $this->message = $message; + $this->display(); + $this->output->writeln(''); + $this->started = false; + } + + /** + * Gets the format for a given name. + * + * @param string $name The format name + * + * @return string|null A format string + */ + public static function getFormatDefinition($name) + { + if (!self::$formats) { + self::$formats = self::initFormats(); + } + + return isset(self::$formats[$name]) ? self::$formats[$name] : null; + } + + /** + * Sets a placeholder formatter for a given name. + * + * This method also allow you to override an existing placeholder. + * + * @param string $name The placeholder name (including the delimiter char like %) + * @param callable $callable A PHP callable + */ + public static function setPlaceholderFormatterDefinition($name, $callable) + { + if (!self::$formatters) { + self::$formatters = self::initPlaceholderFormatters(); + } + + self::$formatters[$name] = $callable; + } + + /** + * Gets the placeholder formatter for a given name. + * + * @param string $name The placeholder name (including the delimiter char like %) + * + * @return callable|null A PHP callable + */ + public static function getPlaceholderFormatterDefinition($name) + { + if (!self::$formatters) { + self::$formatters = self::initPlaceholderFormatters(); + } + + return isset(self::$formatters[$name]) ? self::$formatters[$name] : null; + } + + private function display() + { + if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) { + return; + } + + $self = $this; + + $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self) { + if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) { + return call_user_func($formatter, $self); + } + + return $matches[0]; + }, $this->format)); + } + + private function determineBestFormat() + { + switch ($this->output->getVerbosity()) { + // OutputInterface::VERBOSITY_QUIET: display is disabled anyway + case OutputInterface::VERBOSITY_VERBOSE: + return $this->output->isDecorated() ? 'verbose' : 'verbose_no_ansi'; + case OutputInterface::VERBOSITY_VERY_VERBOSE: + case OutputInterface::VERBOSITY_DEBUG: + return $this->output->isDecorated() ? 'very_verbose' : 'very_verbose_no_ansi'; + default: + return $this->output->isDecorated() ? 'normal' : 'normal_no_ansi'; + } + } + + /** + * Overwrites a previous message to the output. + * + * @param string $message The message + */ + private function overwrite($message) + { + // append whitespace to match the line's length + if (null !== $this->lastMessagesLength) { + if ($this->lastMessagesLength > Helper::strlenWithoutDecoration($this->output->getFormatter(), $message)) { + $message = str_pad($message, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT); + } + } + + if ($this->output->isDecorated()) { + $this->output->write("\x0D"); + $this->output->write($message); + } else { + $this->output->writeln($message); + } + + $this->lastMessagesLength = 0; + + $len = Helper::strlenWithoutDecoration($this->output->getFormatter(), $message); + + if ($len > $this->lastMessagesLength) { + $this->lastMessagesLength = $len; + } + } + + private function getCurrentTimeInMilliseconds() + { + return round(microtime(true) * 1000); + } + + private static function initPlaceholderFormatters() + { + return array( + 'indicator' => function (ProgressIndicator $indicator) { + return $indicator->getCurrentValue(); + }, + 'message' => function (ProgressIndicator $indicator) { + return $indicator->getMessage(); + }, + 'elapsed' => function (ProgressIndicator $indicator) { + return Helper::formatTime(time() - $indicator->getStartTime()); + }, + 'memory' => function () { + return Helper::formatMemory(memory_get_usage(true)); + }, + ); + } + + private static function initFormats() + { + return array( + 'normal' => ' %indicator% %message%', + 'normal_no_ansi' => ' %message%', + + 'verbose' => ' %indicator% %message% (%elapsed:6s%)', + 'verbose_no_ansi' => ' %message% (%elapsed:6s%)', + + 'very_verbose' => ' %indicator% %message% (%elapsed:6s%, %memory:6s%)', + 'very_verbose_no_ansi' => ' %message% (%elapsed:6s%, %memory:6s%)', + ); + } +} diff --git a/vendor/symfony/console/Helper/QuestionHelper.php b/vendor/symfony/console/Helper/QuestionHelper.php index a533f87..3707ffe 100644 --- a/vendor/symfony/console/Helper/QuestionHelper.php +++ b/vendor/symfony/console/Helper/QuestionHelper.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Helper; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\ConsoleOutputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -38,7 +40,7 @@ class QuestionHelper extends Helper * * @return string The user answer * - * @throws \RuntimeException If there is no data to read in the input stream + * @throws RuntimeException If there is no data to read in the input stream */ public function ask(InputInterface $input, OutputInterface $output, Question $question) { @@ -70,12 +72,12 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu * * @param resource $stream The input stream * - * @throws \InvalidArgumentException In case the stream is not a resource + * @throws InvalidArgumentException In case the stream is not a resource */ public function setInputStream($stream) { if (!is_resource($stream)) { - throw new \InvalidArgumentException('Input stream must be a valid resource.'); + throw new InvalidArgumentException('Input stream must be a valid resource.'); } $this->inputStream = $stream; @@ -132,11 +134,7 @@ public function doAsk(OutputInterface $output, Question $question) } if (false === $ret) { - $ret = fgets($inputStream, 4096); - if (false === $ret) { - throw new \RuntimeException('Aborted'); - } - $ret = trim($ret); + $ret = $this->readFromInput($inputStream); } } else { $ret = trim($this->autocomplete($output, $question, $inputStream)); @@ -319,7 +317,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu * * @return string The answer * - * @throws \RuntimeException In case the fallback is deactivated and the response cannot be hidden + * @throws RuntimeException In case the fallback is deactivated and the response cannot be hidden */ private function getHiddenResponse(OutputInterface $output, $inputStream) { @@ -351,7 +349,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream) shell_exec(sprintf('stty %s', $sttyMode)); if (false === $value) { - throw new \RuntimeException('Aborted'); + throw new RuntimeException('Aborted'); } $value = trim($value); @@ -369,7 +367,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream) return $value; } - throw new \RuntimeException('Unable to hide the response.'); + throw new RuntimeException('Unable to hide the response.'); } /** @@ -429,6 +427,30 @@ private function getShell() } /** + * Reads user input. + * + * @param resource $stream The input stream + * + * @return string User input + * + * @throws RuntimeException + */ + private function readFromInput($stream) + { + if (STDIN === $stream && function_exists('readline')) { + $ret = readline(); + } else { + $ret = fgets($stream, 4096); + } + + if (false === $ret) { + throw new RuntimeException('Aborted'); + } + + return trim($ret); + } + + /** * Returns whether Stty is available or not. * * @return bool diff --git a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php index 77130f9..487f062 100644 --- a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php +++ b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Console\Helper; +use Symfony\Component\Console\Exception\LogicException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\ChoiceQuestion; @@ -38,7 +39,7 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu // make required if (!is_array($value) && !is_bool($value) && 0 === strlen($value)) { - throw new \Exception('A value is required.'); + throw new LogicException('A value is required.'); } return $value; diff --git a/vendor/symfony/console/Helper/Table.php b/vendor/symfony/console/Helper/Table.php index 6f5fbd0..db41f09 100644 --- a/vendor/symfony/console/Helper/Table.php +++ b/vendor/symfony/console/Helper/Table.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Console\Helper; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Exception\InvalidArgumentException; /** * Provides helpers to display a table. @@ -19,6 +20,7 @@ * @author Fabien Potencier * @author Саша Стаменковић * @author Abdellatif Ait boudad + * @author Max Grigorian */ class Table { @@ -60,6 +62,11 @@ class Table */ private $style; + /** + * @var array + */ + private $columnStyles = array(); + private static $styles; public function __construct(OutputInterface $output) @@ -102,7 +109,7 @@ public static function getStyleDefinition($name) } if (!self::$styles[$name]) { - throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); + throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); } return self::$styles[$name]; @@ -122,7 +129,7 @@ public function setStyle($name) } elseif (isset(self::$styles[$name])) { $this->style = self::$styles[$name]; } else { - throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); + throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); } return $this; @@ -138,6 +145,47 @@ public function getStyle() return $this->style; } + /** + * Sets table column style. + * + * @param int $columnIndex Column index + * @param TableStyle|string $name The style name or a TableStyle instance + * + * @return Table + */ + public function setColumnStyle($columnIndex, $name) + { + $columnIndex = intval($columnIndex); + + if ($name instanceof TableStyle) { + $this->columnStyles[$columnIndex] = $name; + } elseif (isset(self::$styles[$name])) { + $this->columnStyles[$columnIndex] = self::$styles[$name]; + } else { + throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); + } + + return $this; + } + + /** + * Gets the current style for a column. + * + * If style was not set, it returns the global table style. + * + * @param int $columnIndex Column index + * + * @return TableStyle + */ + public function getColumnStyle($columnIndex) + { + if (isset($this->columnStyles[$columnIndex])) { + return $this->columnStyles[$columnIndex]; + } + + return $this->getStyle(); + } + public function setHeaders(array $headers) { $headers = array_values($headers); @@ -175,7 +223,7 @@ public function addRow($row) } if (!is_array($row)) { - throw new \InvalidArgumentException('A row must be an array or a TableSeparator instance.'); + throw new InvalidArgumentException('A row must be an array or a TableSeparator instance.'); } $this->rows[] = array_values($row); @@ -205,24 +253,26 @@ public function setRow($column, array $row) public function render() { $this->calculateNumberOfColumns(); - $this->rows = $this->buildTableRows($this->rows); - $this->headers = $this->buildTableRows($this->headers); + $rows = $this->buildTableRows($this->rows); + $headers = $this->buildTableRows($this->headers); + + $this->calculateColumnsWidth(array_merge($headers, $rows)); $this->renderRowSeparator(); - if (!empty($this->headers)) { - foreach ($this->headers as $header) { + if (!empty($headers)) { + foreach ($headers as $header) { $this->renderRow($header, $this->style->getCellHeaderFormat()); $this->renderRowSeparator(); } } - foreach ($this->rows as $row) { + foreach ($rows as $row) { if ($row instanceof TableSeparator) { $this->renderRowSeparator(); } else { $this->renderRow($row, $this->style->getCellRowFormat()); } } - if (!empty($this->rows)) { + if (!empty($rows)) { $this->renderRowSeparator(); } @@ -246,7 +296,7 @@ private function renderRowSeparator() $markup = $this->style->getCrossingChar(); for ($column = 0; $column < $count; ++$column) { - $markup .= str_repeat($this->style->getHorizontalBorderChar(), $this->getColumnWidth($column)).$this->style->getCrossingChar(); + $markup .= str_repeat($this->style->getHorizontalBorderChar(), $this->columnWidths[$column]).$this->style->getCrossingChar(); } $this->output->writeln(sprintf($this->style->getBorderFormat(), $markup)); @@ -292,25 +342,27 @@ private function renderRow(array $row, $cellFormat) private function renderCell(array $row, $column, $cellFormat) { $cell = isset($row[$column]) ? $row[$column] : ''; - $width = $this->getColumnWidth($column); + $width = $this->columnWidths[$column]; if ($cell instanceof TableCell && $cell->getColspan() > 1) { // add the width of the following columns(numbers of colspan). foreach (range($column + 1, $column + $cell->getColspan() - 1) as $nextColumn) { - $width += $this->getColumnSeparatorWidth() + $this->getColumnWidth($nextColumn); + $width += $this->getColumnSeparatorWidth() + $this->columnWidths[$nextColumn]; } } // str_pad won't work properly with multi-byte strings, we need to fix the padding - if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell)) { + if (false !== $encoding = mb_detect_encoding($cell, null, true)) { $width += strlen($cell) - mb_strwidth($cell, $encoding); } + $style = $this->getColumnStyle($column); + if ($cell instanceof TableSeparator) { - $this->output->write(sprintf($this->style->getBorderFormat(), str_repeat($this->style->getHorizontalBorderChar(), $width))); + $this->output->write(sprintf($style->getBorderFormat(), str_repeat($style->getHorizontalBorderChar(), $width))); } else { $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell); - $content = sprintf($this->style->getCellRowContentFormat(), $cell); - $this->output->write(sprintf($cellFormat, str_pad($content, $width, $this->style->getPaddingChar(), $this->style->getPadType()))); + $content = sprintf($style->getCellRowContentFormat(), $cell); + $this->output->write(sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $style->getPadType()))); } } @@ -509,21 +561,20 @@ private function getRowColumns($row) * * @return int */ - private function getColumnWidth($column) + private function calculateColumnsWidth($rows) { - if (isset($this->columnWidths[$column])) { - return $this->columnWidths[$column]; - } + for ($column = 0; $column < $this->numberOfColumns; ++$column) { + $lengths = array(); + foreach ($rows as $row) { + if ($row instanceof TableSeparator) { + continue; + } - foreach (array_merge($this->headers, $this->rows) as $row) { - if ($row instanceof TableSeparator) { - continue; + $lengths[] = $this->getCellWidth($row, $column); } - $lengths[] = $this->getCellWidth($row, $column); + $this->columnWidths[$column] = max($lengths) + strlen($this->style->getCellRowContentFormat()) - 2; } - - return $this->columnWidths[$column] = max($lengths) + strlen($this->style->getCellRowContentFormat()) - 2; } /** diff --git a/vendor/symfony/console/Helper/TableCell.php b/vendor/symfony/console/Helper/TableCell.php index aa0d318..69442d4 100644 --- a/vendor/symfony/console/Helper/TableCell.php +++ b/vendor/symfony/console/Helper/TableCell.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Helper; +use Symfony\Component\Console\Exception\InvalidArgumentException; + /** * @author Abdellatif Ait boudad */ @@ -39,7 +41,7 @@ public function __construct($value = '', array $options = array()) // check option names if ($diff = array_diff(array_keys($options), array_keys($this->options))) { - throw new \InvalidArgumentException(sprintf('The TableCell does not support the following options: \'%s\'.', implode('\', \'', $diff))); + throw new InvalidArgumentException(sprintf('The TableCell does not support the following options: \'%s\'.', implode('\', \'', $diff))); } $this->options = array_merge($this->options, $options); diff --git a/vendor/symfony/console/Helper/TableHelper.php b/vendor/symfony/console/Helper/TableHelper.php index 2953522..ebd6785 100644 --- a/vendor/symfony/console/Helper/TableHelper.php +++ b/vendor/symfony/console/Helper/TableHelper.php @@ -13,6 +13,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\NullOutput; +use Symfony\Component\Console\Exception\InvalidArgumentException; /** * Provides helpers to display table output. @@ -50,7 +51,7 @@ public function __construct($triggerDeprecationError = true) * * @return TableHelper * - * @throws \InvalidArgumentException when the table layout is not known + * @throws InvalidArgumentException when the table layout is not known */ public function setLayout($layout) { @@ -68,7 +69,7 @@ public function setLayout($layout) break; default: - throw new \InvalidArgumentException(sprintf('Invalid table layout "%s".', $layout)); + throw new InvalidArgumentException(sprintf('Invalid table layout "%s".', $layout)); }; return $this; diff --git a/vendor/symfony/console/Helper/TableStyle.php b/vendor/symfony/console/Helper/TableStyle.php index f0f46c7..d7e28ff 100644 --- a/vendor/symfony/console/Helper/TableStyle.php +++ b/vendor/symfony/console/Helper/TableStyle.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Console\Helper; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\LogicException; + /** * Defines the styles for a Table. * @@ -39,7 +42,7 @@ class TableStyle public function setPaddingChar($paddingChar) { if (!$paddingChar) { - throw new \LogicException('The padding char must not be empty'); + throw new LogicException('The padding char must not be empty'); } $this->paddingChar = $paddingChar; @@ -235,7 +238,7 @@ public function getBorderFormat() public function setPadType($padType) { if (!in_array($padType, array(STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH), true)) { - throw new \InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).'); + throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).'); } $this->padType = $padType; diff --git a/vendor/symfony/console/Input/ArgvInput.php b/vendor/symfony/console/Input/ArgvInput.php index 43b28d5..02d4cdb 100644 --- a/vendor/symfony/console/Input/ArgvInput.php +++ b/vendor/symfony/console/Input/ArgvInput.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Input; +use Symfony\Component\Console\Exception\RuntimeException; + /** * ArgvInput represents an input coming from the CLI arguments. * @@ -114,14 +116,14 @@ private function parseShortOption($token) * * @param string $name The current token * - * @throws \RuntimeException When option given doesn't exist + * @throws RuntimeException When option given doesn't exist */ private function parseShortOptionSet($name) { $len = strlen($name); for ($i = 0; $i < $len; ++$i) { if (!$this->definition->hasShortcut($name[$i])) { - throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i])); + throw new RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i])); } $option = $this->definition->getOptionForShortcut($name[$i]); @@ -156,7 +158,7 @@ private function parseLongOption($token) * * @param string $token The current token * - * @throws \RuntimeException When too many arguments are given + * @throws RuntimeException When too many arguments are given */ private function parseArgument($token) { @@ -174,7 +176,7 @@ private function parseArgument($token) // unexpected argument } else { - throw new \RuntimeException('Too many arguments.'); + throw new RuntimeException('Too many arguments.'); } } @@ -184,12 +186,12 @@ private function parseArgument($token) * @param string $shortcut The short option key * @param mixed $value The value for the option * - * @throws \RuntimeException When option given doesn't exist + * @throws RuntimeException When option given doesn't exist */ private function addShortOption($shortcut, $value) { if (!$this->definition->hasShortcut($shortcut)) { - throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut)); + throw new RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut)); } $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value); @@ -201,12 +203,12 @@ private function addShortOption($shortcut, $value) * @param string $name The long option key * @param mixed $value The value for the option * - * @throws \RuntimeException When option given doesn't exist + * @throws RuntimeException When option given doesn't exist */ private function addLongOption($name, $value) { if (!$this->definition->hasOption($name)) { - throw new \RuntimeException(sprintf('The "--%s" option does not exist.', $name)); + throw new RuntimeException(sprintf('The "--%s" option does not exist.', $name)); } $option = $this->definition->getOption($name); @@ -217,7 +219,7 @@ private function addLongOption($name, $value) } if (null !== $value && !$option->acceptValue()) { - throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name)); + throw new RuntimeException(sprintf('The "--%s" option does not accept a value.', $name)); } if (null === $value && $option->acceptValue() && count($this->parsed)) { @@ -235,7 +237,7 @@ private function addLongOption($name, $value) if (null === $value) { if ($option->isValueRequired()) { - throw new \RuntimeException(sprintf('The "--%s" option requires a value.', $name)); + throw new RuntimeException(sprintf('The "--%s" option requires a value.', $name)); } if (!$option->isArray()) { diff --git a/vendor/symfony/console/Input/ArrayInput.php b/vendor/symfony/console/Input/ArrayInput.php index 99c9788..8cedbb3 100644 --- a/vendor/symfony/console/Input/ArrayInput.php +++ b/vendor/symfony/console/Input/ArrayInput.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Console\Input; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\InvalidOptionException; + /** * ArrayInput represents an input provided as an array. * @@ -149,12 +152,12 @@ protected function parse() * @param string $shortcut The short option key * @param mixed $value The value for the option * - * @throws \InvalidArgumentException When option given doesn't exist + * @throws InvalidOptionException When option given doesn't exist */ private function addShortOption($shortcut, $value) { if (!$this->definition->hasShortcut($shortcut)) { - throw new \InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut)); + throw new InvalidOptionException(sprintf('The "-%s" option does not exist.', $shortcut)); } $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value); @@ -166,20 +169,20 @@ private function addShortOption($shortcut, $value) * @param string $name The long option key * @param mixed $value The value for the option * - * @throws \InvalidArgumentException When option given doesn't exist - * @throws \InvalidArgumentException When a required value is missing + * @throws InvalidOptionException When option given doesn't exist + * @throws InvalidOptionException When a required value is missing */ private function addLongOption($name, $value) { if (!$this->definition->hasOption($name)) { - throw new \InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name)); + throw new InvalidOptionException(sprintf('The "--%s" option does not exist.', $name)); } $option = $this->definition->getOption($name); if (null === $value) { if ($option->isValueRequired()) { - throw new \InvalidArgumentException(sprintf('The "--%s" option requires a value.', $name)); + throw new InvalidOptionException(sprintf('The "--%s" option requires a value.', $name)); } $value = $option->isValueOptional() ? $option->getDefault() : true; @@ -194,12 +197,12 @@ private function addLongOption($name, $value) * @param string $name The argument name * @param mixed $value The value for the argument * - * @throws \InvalidArgumentException When argument given doesn't exist + * @throws InvalidArgumentException When argument given doesn't exist */ private function addArgument($name, $value) { if (!$this->definition->hasArgument($name)) { - throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); } $this->arguments[$name] = $value; diff --git a/vendor/symfony/console/Input/Input.php b/vendor/symfony/console/Input/Input.php index e26fcc1..85499fc 100644 --- a/vendor/symfony/console/Input/Input.php +++ b/vendor/symfony/console/Input/Input.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Console\Input; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\RuntimeException; + /** * Input is the base class for all concrete Input classes. * @@ -69,7 +72,7 @@ public function bind(InputDefinition $definition) /** * Validates the input. * - * @throws \RuntimeException When not enough arguments are given + * @throws RuntimeException When not enough arguments are given */ public function validate() { @@ -81,7 +84,7 @@ public function validate() }); if (count($missingArguments) > 0) { - throw new \RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments))); + throw new RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments))); } } @@ -122,12 +125,12 @@ public function getArguments() * * @return mixed The argument value * - * @throws \InvalidArgumentException When argument given doesn't exist + * @throws InvalidArgumentException When argument given doesn't exist */ public function getArgument($name) { if (!$this->definition->hasArgument($name)) { - throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); } return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)->getDefault(); @@ -139,12 +142,12 @@ public function getArgument($name) * @param string $name The argument name * @param string $value The argument value * - * @throws \InvalidArgumentException When argument given doesn't exist + * @throws InvalidArgumentException When argument given doesn't exist */ public function setArgument($name, $value) { if (!$this->definition->hasArgument($name)) { - throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); } $this->arguments[$name] = $value; @@ -179,12 +182,12 @@ public function getOptions() * * @return mixed The option value * - * @throws \InvalidArgumentException When option given doesn't exist + * @throws InvalidArgumentException When option given doesn't exist */ public function getOption($name) { if (!$this->definition->hasOption($name)) { - throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "%s" option does not exist.', $name)); } return isset($this->options[$name]) ? $this->options[$name] : $this->definition->getOption($name)->getDefault(); @@ -196,12 +199,12 @@ public function getOption($name) * @param string $name The option name * @param string|bool $value The option value * - * @throws \InvalidArgumentException When option given doesn't exist + * @throws InvalidArgumentException When option given doesn't exist */ public function setOption($name, $value) { if (!$this->definition->hasOption($name)) { - throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "%s" option does not exist.', $name)); } $this->options[$name] = $value; diff --git a/vendor/symfony/console/Input/InputArgument.php b/vendor/symfony/console/Input/InputArgument.php index 69edecb..048ee4f 100644 --- a/vendor/symfony/console/Input/InputArgument.php +++ b/vendor/symfony/console/Input/InputArgument.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Console\Input; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\LogicException; + /** * Represents a command line argument. * @@ -35,14 +38,14 @@ class InputArgument * @param string $description A description text * @param mixed $default The default value (for self::OPTIONAL mode only) * - * @throws \InvalidArgumentException When argument mode is not valid + * @throws InvalidArgumentException When argument mode is not valid */ public function __construct($name, $mode = null, $description = '', $default = null) { if (null === $mode) { $mode = self::OPTIONAL; } elseif (!is_int($mode) || $mode > 7 || $mode < 1) { - throw new \InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode)); + throw new InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode)); } $this->name = $name; @@ -87,19 +90,19 @@ public function isArray() * * @param mixed $default The default value * - * @throws \LogicException When incorrect default value is given + * @throws LogicException When incorrect default value is given */ public function setDefault($default = null) { if (self::REQUIRED === $this->mode && null !== $default) { - throw new \LogicException('Cannot set a default value except for InputArgument::OPTIONAL mode.'); + throw new LogicException('Cannot set a default value except for InputArgument::OPTIONAL mode.'); } if ($this->isArray()) { if (null === $default) { $default = array(); } elseif (!is_array($default)) { - throw new \LogicException('A default value for an array argument must be an array.'); + throw new LogicException('A default value for an array argument must be an array.'); } } diff --git a/vendor/symfony/console/Input/InputDefinition.php b/vendor/symfony/console/Input/InputDefinition.php index 809baeb..bd64163 100644 --- a/vendor/symfony/console/Input/InputDefinition.php +++ b/vendor/symfony/console/Input/InputDefinition.php @@ -14,6 +14,8 @@ use Symfony\Component\Console\Descriptor\TextDescriptor; use Symfony\Component\Console\Descriptor\XmlDescriptor; use Symfony\Component\Console\Output\BufferedOutput; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\LogicException; /** * A InputDefinition represents a set of valid command line arguments and options. @@ -100,20 +102,20 @@ public function addArguments($arguments = array()) * * @param InputArgument $argument An InputArgument object * - * @throws \LogicException When incorrect argument is given + * @throws LogicException When incorrect argument is given */ public function addArgument(InputArgument $argument) { if (isset($this->arguments[$argument->getName()])) { - throw new \LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName())); + throw new LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName())); } if ($this->hasAnArrayArgument) { - throw new \LogicException('Cannot add an argument after an array argument.'); + throw new LogicException('Cannot add an argument after an array argument.'); } if ($argument->isRequired() && $this->hasOptional) { - throw new \LogicException('Cannot add a required argument after an optional one.'); + throw new LogicException('Cannot add a required argument after an optional one.'); } if ($argument->isArray()) { @@ -136,12 +138,12 @@ public function addArgument(InputArgument $argument) * * @return InputArgument An InputArgument object * - * @throws \InvalidArgumentException When argument given doesn't exist + * @throws InvalidArgumentException When argument given doesn't exist */ public function getArgument($name) { if (!$this->hasArgument($name)) { - throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name)); } $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments; @@ -237,18 +239,18 @@ public function addOptions($options = array()) * * @param InputOption $option An InputOption object * - * @throws \LogicException When option given already exist + * @throws LogicException When option given already exist */ public function addOption(InputOption $option) { if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) { - throw new \LogicException(sprintf('An option named "%s" already exists.', $option->getName())); + throw new LogicException(sprintf('An option named "%s" already exists.', $option->getName())); } if ($option->getShortcut()) { foreach (explode('|', $option->getShortcut()) as $shortcut) { if (isset($this->shortcuts[$shortcut]) && !$option->equals($this->options[$this->shortcuts[$shortcut]])) { - throw new \LogicException(sprintf('An option with shortcut "%s" already exists.', $shortcut)); + throw new LogicException(sprintf('An option with shortcut "%s" already exists.', $shortcut)); } } } @@ -268,12 +270,12 @@ public function addOption(InputOption $option) * * @return InputOption A InputOption object * - * @throws \InvalidArgumentException When option given doesn't exist + * @throws InvalidArgumentException When option given doesn't exist */ public function getOption($name) { if (!$this->hasOption($name)) { - throw new \InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name)); + throw new InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name)); } return $this->options[$name]; @@ -347,12 +349,12 @@ public function getOptionDefaults() * * @return string The InputOption name * - * @throws \InvalidArgumentException When option given does not exist + * @throws InvalidArgumentException When option given does not exist */ private function shortcutToName($shortcut) { if (!isset($this->shortcuts[$shortcut])) { - throw new \InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut)); + throw new InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut)); } return $this->shortcuts[$shortcut]; diff --git a/vendor/symfony/console/Input/InputInterface.php b/vendor/symfony/console/Input/InputInterface.php index 6ef2f26..f83b885 100644 --- a/vendor/symfony/console/Input/InputInterface.php +++ b/vendor/symfony/console/Input/InputInterface.php @@ -88,7 +88,7 @@ public function getArgument($name); * @param string $name The argument name * @param string $value The argument value * - * @throws \InvalidArgumentException When argument given doesn't exist + * @throws InvalidArgumentException When argument given doesn't exist */ public function setArgument($name, $value); @@ -123,7 +123,7 @@ public function getOption($name); * @param string $name The option name * @param string|bool $value The option value * - * @throws \InvalidArgumentException When option given doesn't exist + * @throws InvalidArgumentException When option given doesn't exist */ public function setOption($name, $value); diff --git a/vendor/symfony/console/Input/InputOption.php b/vendor/symfony/console/Input/InputOption.php index 167f199..3a752cb 100644 --- a/vendor/symfony/console/Input/InputOption.php +++ b/vendor/symfony/console/Input/InputOption.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Console\Input; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\LogicException; + /** * Represents a command line option. * @@ -38,7 +41,7 @@ class InputOption * @param string $description A description text * @param mixed $default The default value (must be null for self::VALUE_REQUIRED or self::VALUE_NONE) * - * @throws \InvalidArgumentException If option mode is invalid or incompatible + * @throws InvalidArgumentException If option mode is invalid or incompatible */ public function __construct($name, $shortcut = null, $mode = null, $description = '', $default = null) { @@ -47,7 +50,7 @@ public function __construct($name, $shortcut = null, $mode = null, $description } if (empty($name)) { - throw new \InvalidArgumentException('An option name cannot be empty.'); + throw new InvalidArgumentException('An option name cannot be empty.'); } if (empty($shortcut)) { @@ -63,14 +66,14 @@ public function __construct($name, $shortcut = null, $mode = null, $description $shortcut = implode('|', $shortcuts); if (empty($shortcut)) { - throw new \InvalidArgumentException('An option shortcut cannot be empty.'); + throw new InvalidArgumentException('An option shortcut cannot be empty.'); } } if (null === $mode) { $mode = self::VALUE_NONE; } elseif (!is_int($mode) || $mode > 15 || $mode < 1) { - throw new \InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode)); + throw new InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode)); } $this->name = $name; @@ -79,7 +82,7 @@ public function __construct($name, $shortcut = null, $mode = null, $description $this->description = $description; if ($this->isArray() && !$this->acceptValue()) { - throw new \InvalidArgumentException('Impossible to have an option mode VALUE_IS_ARRAY if the option does not accept a value.'); + throw new InvalidArgumentException('Impossible to have an option mode VALUE_IS_ARRAY if the option does not accept a value.'); } $this->setDefault($default); @@ -150,19 +153,19 @@ public function isArray() * * @param mixed $default The default value * - * @throws \LogicException When incorrect default value is given + * @throws LogicException When incorrect default value is given */ public function setDefault($default = null) { if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) { - throw new \LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.'); + throw new LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.'); } if ($this->isArray()) { if (null === $default) { $default = array(); } elseif (!is_array($default)) { - throw new \LogicException('A default value for an array option must be an array.'); + throw new LogicException('A default value for an array option must be an array.'); } } diff --git a/vendor/symfony/console/Input/StringInput.php b/vendor/symfony/console/Input/StringInput.php index c518d5c..a40ddba 100644 --- a/vendor/symfony/console/Input/StringInput.php +++ b/vendor/symfony/console/Input/StringInput.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Input; +use Symfony\Component\Console\Exception\InvalidArgumentException; + /** * StringInput represents an input provided as a string. * @@ -55,7 +57,7 @@ public function __construct($input, InputDefinition $definition = null) * * @return array An array of tokens * - * @throws \InvalidArgumentException When unable to parse input (should never happen) + * @throws InvalidArgumentException When unable to parse input (should never happen) */ private function tokenize($input) { @@ -72,7 +74,7 @@ private function tokenize($input) $tokens[] = stripcslashes($match[1]); } else { // should never happen - throw new \InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10))); + throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10))); } $cursor += strlen($match[0]); diff --git a/vendor/symfony/console/Output/NullOutput.php b/vendor/symfony/console/Output/NullOutput.php index a14ae74..682f9a4 100644 --- a/vendor/symfony/console/Output/NullOutput.php +++ b/vendor/symfony/console/Output/NullOutput.php @@ -96,7 +96,7 @@ public function isDebug() /** * {@inheritdoc} */ - public function writeln($messages, $type = self::OUTPUT_NORMAL) + public function writeln($messages, $options = self::OUTPUT_NORMAL) { // do nothing } @@ -104,7 +104,7 @@ public function writeln($messages, $type = self::OUTPUT_NORMAL) /** * {@inheritdoc} */ - public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL) + public function write($messages, $newline = false, $options = self::OUTPUT_NORMAL) { // do nothing } diff --git a/vendor/symfony/console/Output/Output.php b/vendor/symfony/console/Output/Output.php index 306dccf..4476ffb 100644 --- a/vendor/symfony/console/Output/Output.php +++ b/vendor/symfony/console/Output/Output.php @@ -117,22 +117,28 @@ public function isDebug() /** * {@inheritdoc} */ - public function writeln($messages, $type = self::OUTPUT_NORMAL) + public function writeln($messages, $options = self::OUTPUT_NORMAL) { - $this->write($messages, true, $type); + $this->write($messages, true, $options); } /** * {@inheritdoc} */ - public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL) + public function write($messages, $newline = false, $options = self::OUTPUT_NORMAL) { - if (self::VERBOSITY_QUIET === $this->verbosity) { + $messages = (array) $messages; + + $types = self::OUTPUT_NORMAL | self::OUTPUT_RAW | self::OUTPUT_PLAIN; + $type = $types & $options ?: self::OUTPUT_NORMAL; + + $verbosities = self::VERBOSITY_QUIET | self::VERBOSITY_NORMAL | self::VERBOSITY_VERBOSE | self::VERBOSITY_VERY_VERBOSE | self::VERBOSITY_DEBUG; + $verbosity = $verbosities & $options ?: self::VERBOSITY_NORMAL; + + if ($verbosity > $this->getVerbosity()) { return; } - $messages = (array) $messages; - foreach ($messages as $message) { switch ($type) { case OutputInterface::OUTPUT_NORMAL: @@ -143,8 +149,6 @@ public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL) case OutputInterface::OUTPUT_PLAIN: $message = strip_tags($this->formatter->format($message)); break; - default: - throw new \InvalidArgumentException(sprintf('Unknown output type given (%s)', $type)); } $this->doWrite($message, $newline); diff --git a/vendor/symfony/console/Output/OutputInterface.php b/vendor/symfony/console/Output/OutputInterface.php index 9a956e2..9a8290b 100644 --- a/vendor/symfony/console/Output/OutputInterface.php +++ b/vendor/symfony/console/Output/OutputInterface.php @@ -20,36 +20,32 @@ */ interface OutputInterface { - const VERBOSITY_QUIET = 0; - const VERBOSITY_NORMAL = 1; - const VERBOSITY_VERBOSE = 2; - const VERBOSITY_VERY_VERBOSE = 3; - const VERBOSITY_DEBUG = 4; + const VERBOSITY_QUIET = 16; + const VERBOSITY_NORMAL = 32; + const VERBOSITY_VERBOSE = 64; + const VERBOSITY_VERY_VERBOSE = 128; + const VERBOSITY_DEBUG = 256; - const OUTPUT_NORMAL = 0; - const OUTPUT_RAW = 1; - const OUTPUT_PLAIN = 2; + const OUTPUT_NORMAL = 1; + const OUTPUT_RAW = 2; + const OUTPUT_PLAIN = 4; /** * Writes a message to the output. * * @param string|array $messages The message as an array of lines or a single string * @param bool $newline Whether to add a newline - * @param int $type The type of output (one of the OUTPUT constants) - * - * @throws \InvalidArgumentException When unknown output type is given + * @param int $options A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL */ - public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL); + public function write($messages, $newline = false, $options = 0); /** * Writes a message to the output and adds a newline at the end. * - * @param string|array $messages The message as an array of lines or a single string - * @param int $type The type of output (one of the OUTPUT constants) - * - * @throws \InvalidArgumentException When unknown output type is given + * @param string|array $messages The message as an array of lines of a single string + * @param int $options A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL */ - public function writeln($messages, $type = self::OUTPUT_NORMAL); + public function writeln($messages, $options = 0); /** * Sets the verbosity of the output. diff --git a/vendor/symfony/console/Output/StreamOutput.php b/vendor/symfony/console/Output/StreamOutput.php index a1facda..62d04c0 100644 --- a/vendor/symfony/console/Output/StreamOutput.php +++ b/vendor/symfony/console/Output/StreamOutput.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Output; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Formatter\OutputFormatterInterface; /** @@ -38,12 +40,12 @@ class StreamOutput extends Output * @param bool|null $decorated Whether to decorate messages (null for auto-guessing) * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter) * - * @throws \InvalidArgumentException When first argument is not a real stream + * @throws InvalidArgumentException When first argument is not a real stream */ public function __construct($stream, $verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null) { if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) { - throw new \InvalidArgumentException('The StreamOutput class needs a stream as its first argument.'); + throw new InvalidArgumentException('The StreamOutput class needs a stream as its first argument.'); } $this->stream = $stream; @@ -72,7 +74,7 @@ protected function doWrite($message, $newline) { if (false === @fwrite($this->stream, $message.($newline ? PHP_EOL : ''))) { // should never happen - throw new \RuntimeException('Unable to write output.'); + throw new RuntimeException('Unable to write output.'); } fflush($this->stream); diff --git a/vendor/symfony/console/Question/ChoiceQuestion.php b/vendor/symfony/console/Question/ChoiceQuestion.php index a36c739..2c40638 100644 --- a/vendor/symfony/console/Question/ChoiceQuestion.php +++ b/vendor/symfony/console/Question/ChoiceQuestion.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Console\Question; +use Symfony\Component\Console\Exception\InvalidArgumentException; + /** * Represents a choice question. * @@ -126,7 +128,7 @@ private function getDefaultValidator() if ($multiselect) { // Check for a separated comma values if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) { - throw new \InvalidArgumentException(sprintf($errorMessage, $selected)); + throw new InvalidArgumentException(sprintf($errorMessage, $selected)); } $selectedChoices = explode(',', $selectedChoices); } else { @@ -143,7 +145,7 @@ private function getDefaultValidator() } if (count($results) > 1) { - throw new \InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results))); + throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results))); } $result = array_search($value, $choices); @@ -159,7 +161,7 @@ private function getDefaultValidator() } if (false === $result) { - throw new \InvalidArgumentException(sprintf($errorMessage, $value)); + throw new InvalidArgumentException(sprintf($errorMessage, $value)); } $multiselectChoices[] = (string) $result; diff --git a/vendor/symfony/console/Question/Question.php b/vendor/symfony/console/Question/Question.php index ffe9417..6effa42 100644 --- a/vendor/symfony/console/Question/Question.php +++ b/vendor/symfony/console/Question/Question.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Console\Question; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Exception\LogicException; + /** * Represents a Question. * @@ -76,12 +79,12 @@ public function isHidden() * * @return Question The current instance * - * @throws \LogicException In case the autocompleter is also used + * @throws LogicException In case the autocompleter is also used */ public function setHidden($hidden) { if ($this->autocompleterValues) { - throw new \LogicException('A hidden question cannot use the autocompleter.'); + throw new LogicException('A hidden question cannot use the autocompleter.'); } $this->hidden = (bool) $hidden; @@ -130,8 +133,8 @@ public function getAutocompleterValues() * * @return Question The current instance * - * @throws \InvalidArgumentException - * @throws \LogicException + * @throws InvalidArgumentException + * @throws LogicException */ public function setAutocompleterValues($values) { @@ -141,12 +144,12 @@ public function setAutocompleterValues($values) if (null !== $values && !is_array($values)) { if (!$values instanceof \Traversable || $values instanceof \Countable) { - throw new \InvalidArgumentException('Autocompleter values can be either an array, `null` or an object implementing both `Countable` and `Traversable` interfaces.'); + throw new InvalidArgumentException('Autocompleter values can be either an array, `null` or an object implementing both `Countable` and `Traversable` interfaces.'); } } if ($this->hidden) { - throw new \LogicException('A hidden question cannot use the autocompleter.'); + throw new LogicException('A hidden question cannot use the autocompleter.'); } $this->autocompleterValues = $values; @@ -187,12 +190,12 @@ public function getValidator() * * @return Question The current instance * - * @throws \InvalidArgumentException In case the number of attempts is invalid. + * @throws InvalidArgumentException In case the number of attempts is invalid. */ public function setMaxAttempts($attempts) { if (null !== $attempts && $attempts < 1) { - throw new \InvalidArgumentException('Maximum number of attempts must be a positive value.'); + throw new InvalidArgumentException('Maximum number of attempts must be a positive value.'); } $this->attempts = $attempts; diff --git a/vendor/symfony/console/Shell.php b/vendor/symfony/console/Shell.php index eaaadfd..0f39069 100644 --- a/vendor/symfony/console/Shell.php +++ b/vendor/symfony/console/Shell.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Console; +use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Input\StringInput; use Symfony\Component\Console\Output\ConsoleOutput; use Symfony\Component\Process\ProcessBuilder; @@ -22,6 +23,8 @@ * Support for history and completion only works with a PHP compiled * with readline support (either --with-readline or --with-libedit) * + * @deprecated since version 2.8, to be removed in 3.0. + * * @author Fabien Potencier * @author Martin Hasoň */ @@ -43,6 +46,8 @@ class Shell */ public function __construct(Application $application) { + @trigger_error('The '.__CLASS__.' class is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + $this->hasReadline = function_exists('readline'); $this->application = $application; $this->history = getenv('HOME').'/.history_'.$application->getName(); @@ -222,7 +227,7 @@ public function setProcessIsolation($processIsolation) $this->processIsolation = (bool) $processIsolation; if ($this->processIsolation && !class_exists('Symfony\\Component\\Process\\Process')) { - throw new \RuntimeException('Unable to isolate processes as the Symfony Process Component is not installed.'); + throw new RuntimeException('Unable to isolate processes as the Symfony Process Component is not installed.'); } } } diff --git a/vendor/symfony/console/Style/SymfonyStyle.php b/vendor/symfony/console/Style/SymfonyStyle.php index 6e9c64f..c69b0dc 100644 --- a/vendor/symfony/console/Style/SymfonyStyle.php +++ b/vendor/symfony/console/Style/SymfonyStyle.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Console\Style; use Symfony\Component\Console\Application; +use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Formatter\OutputFormatter; use Symfony\Component\Console\Helper\Helper; use Symfony\Component\Console\Helper\ProgressBar; @@ -109,7 +110,7 @@ public function title($message) $this->autoPrependBlock(); $this->writeln(array( sprintf('%s', $message), - sprintf('%s', str_repeat('=', strlen($message))), + sprintf('%s', str_repeat('=', Helper::strlenWithoutDecoration($this->getFormatter(), $message))), )); $this->newLine(); } @@ -122,7 +123,7 @@ public function section($message) $this->autoPrependBlock(); $this->writeln(array( sprintf('%s', $message), - sprintf('%s', str_repeat('-', strlen($message))), + sprintf('%s', str_repeat('-', Helper::strlenWithoutDecoration($this->getFormatter(), $message))), )); $this->newLine(); } @@ -148,14 +149,22 @@ public function text($message) { $this->autoPrependText(); - if (!is_array($message)) { - $this->writeln(sprintf(' // %s', $message)); - - return; + $messages = is_array($message) ? array_values($message) : array($message); + foreach ($messages as $message) { + $this->writeln(sprintf(' %s', $message)); } + } + + /** + * {@inheritdoc} + */ + public function comment($message) + { + $this->autoPrependText(); - foreach ($message as $element) { - $this->text($element); + $messages = is_array($message) ? array_values($message) : array($message); + foreach ($messages as $message) { + $this->writeln(sprintf(' // %s', $message)); } } @@ -294,7 +303,7 @@ public function createProgressBar($max = 0) { $progressBar = parent::createProgressBar($max); - if ('\\' === DIRECTORY_SEPARATOR) { + if ('\\' !== DIRECTORY_SEPARATOR) { $progressBar->setEmptyBarCharacter('░'); // light shade character \u2591 $progressBar->setProgressCharacter(''); $progressBar->setBarCharacter('▓'); // dark shade character \u2593 @@ -361,7 +370,7 @@ public function newLine($count = 1) private function getProgressBar() { if (!$this->progressBar) { - throw new \RuntimeException('The ProgressBar is not started.'); + throw new RuntimeException('The ProgressBar is not started.'); } return $this->progressBar; diff --git a/vendor/symfony/console/composer.json b/vendor/symfony/console/composer.json index 38903ab..ab24704 100644 --- a/vendor/symfony/console/composer.json +++ b/vendor/symfony/console/composer.json @@ -16,11 +16,12 @@ } ], "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0", "psr/log": "~1.0" }, "suggest": { @@ -29,12 +30,15 @@ "psr/log": "For using the console logger" }, "autoload": { - "psr-4": { "Symfony\\Component\\Console\\": "" } + "psr-4": { "Symfony\\Component\\Console\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/css-selector/composer.json b/vendor/symfony/css-selector/composer.json index 99eb4da..8836257 100644 --- a/vendor/symfony/css-selector/composer.json +++ b/vendor/symfony/css-selector/composer.json @@ -23,7 +23,10 @@ "php": ">=5.3.9" }, "autoload": { - "psr-4": { "Symfony\\Component\\CssSelector\\": "" } + "psr-4": { "Symfony\\Component\\CssSelector\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/debug/composer.json b/vendor/symfony/debug/composer.json index c1b128a..51b0df6 100644 --- a/vendor/symfony/debug/composer.json +++ b/vendor/symfony/debug/composer.json @@ -27,7 +27,10 @@ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" }, "autoload": { - "psr-4": { "Symfony\\Component\\Debug\\": "" } + "psr-4": { "Symfony\\Component\\Debug\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/dependency-injection/CHANGELOG.md b/vendor/symfony/dependency-injection/CHANGELOG.md index 4272943..da905c1 100644 --- a/vendor/symfony/dependency-injection/CHANGELOG.md +++ b/vendor/symfony/dependency-injection/CHANGELOG.md @@ -1,6 +1,17 @@ CHANGELOG ========= +2.8.0 +----- + + * deprecated the abstract ContainerAware class in favor of ContainerAwareTrait + * deprecated IntrospectableContainerInterface, to be merged with ContainerInterface in 3.0 + * allowed specifying a directory to recursively load all configuration files it contains + * deprecated the concept of scopes + * added `Definition::setShared()` and `Definition::isShared()` + * added ResettableContainerInterface to be able to reset the container to release memory on shutdown + * added a way to define the priority of service decoration + 2.7.0 ----- diff --git a/vendor/symfony/dependency-injection/Compiler/AutowirePass.php b/vendor/symfony/dependency-injection/Compiler/AutowirePass.php new file mode 100644 index 0000000..ec7880b --- /dev/null +++ b/vendor/symfony/dependency-injection/Compiler/AutowirePass.php @@ -0,0 +1,271 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\DependencyInjection\Compiler; + +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\Exception\RuntimeException; +use Symfony\Component\DependencyInjection\Reference; + +/** + * Guesses constructor arguments of services definitions and try to instantiate services if necessary. + * + * @author Kévin Dunglas + */ +class AutowirePass implements CompilerPassInterface +{ + private $container; + private $reflectionClasses = array(); + private $definedTypes = array(); + private $types; + private $notGuessableTypes = array(); + + /** + * {@inheritdoc} + */ + public function process(ContainerBuilder $container) + { + $this->container = $container; + foreach ($container->getDefinitions() as $id => $definition) { + if ($definition->isAutowired()) { + $this->completeDefinition($id, $definition); + } + } + + // Free memory and remove circular reference to container + $this->container = null; + $this->reflectionClasses = array(); + $this->definedTypes = array(); + $this->types = null; + $this->notGuessableTypes = array(); + } + + /** + * Wires the given definition. + * + * @param string $id + * @param Definition $definition + * + * @throws RuntimeException + */ + private function completeDefinition($id, Definition $definition) + { + if (!$reflectionClass = $this->getReflectionClass($id, $definition)) { + return; + } + + $this->container->addClassResource($reflectionClass); + + if (!$constructor = $reflectionClass->getConstructor()) { + return; + } + + $arguments = $definition->getArguments(); + foreach ($constructor->getParameters() as $index => $parameter) { + $argumentExists = array_key_exists($index, $arguments); + if ($argumentExists && '' !== $arguments[$index]) { + continue; + } + + try { + if (!$typeHint = $parameter->getClass()) { + continue; + } + + if (null === $this->types) { + $this->populateAvailableTypes(); + } + + if (isset($this->types[$typeHint->name])) { + $value = new Reference($this->types[$typeHint->name]); + } else { + try { + $value = $this->createAutowiredDefinition($typeHint, $id); + } catch (RuntimeException $e) { + if ($parameter->allowsNull()) { + $value = null; + } elseif ($parameter->isDefaultValueAvailable()) { + $value = $parameter->getDefaultValue(); + } else { + throw $e; + } + } + } + } catch (\ReflectionException $reflectionException) { + // Typehint against a non-existing class + + if (!$parameter->isDefaultValueAvailable()) { + throw new RuntimeException(sprintf('Cannot autowire argument %s for %s because the type-hinted class does not exist (%s).', $index + 1, $definition->getClass(), $reflectionException->getMessage()), 0, $reflectionException); + } + + $value = $parameter->getDefaultValue(); + } + + if ($argumentExists) { + $definition->replaceArgument($index, $value); + } else { + $definition->addArgument($value); + } + } + } + + /** + * Populates the list of available types. + */ + private function populateAvailableTypes() + { + $this->types = array(); + + foreach ($this->container->getDefinitions() as $id => $definition) { + $this->populateAvailableType($id, $definition); + } + } + + /** + * Populates the list of available types for a given definition. + * + * @param string $id + * @param Definition $definition + */ + private function populateAvailableType($id, Definition $definition) + { + // Never use abstract services + if ($definition->isAbstract()) { + return; + } + + foreach ($definition->getAutowiringTypes() as $type) { + $this->definedTypes[$type] = true; + $this->types[$type] = $id; + } + + // Cannot use reflection if the class isn't set + if (!$definition->getClass()) { + return; + } + + if ($reflectionClass = $this->getReflectionClass($id, $definition)) { + $this->extractInterfaces($id, $reflectionClass); + $this->extractAncestors($id, $reflectionClass); + } + } + + /** + * Extracts the list of all interfaces implemented by a class. + * + * @param string $id + * @param \ReflectionClass $reflectionClass + */ + private function extractInterfaces($id, \ReflectionClass $reflectionClass) + { + foreach ($reflectionClass->getInterfaces() as $interfaceName => $reflectionInterface) { + $this->set($interfaceName, $id); + + $this->extractInterfaces($id, $reflectionInterface); + } + } + + /** + * Extracts all inherited types of a class. + * + * @param string $id + * @param \ReflectionClass $reflectionClass + */ + private function extractAncestors($id, \ReflectionClass $reflectionClass) + { + $this->set($reflectionClass->name, $id); + + if ($reflectionParentClass = $reflectionClass->getParentClass()) { + $this->extractAncestors($id, $reflectionParentClass); + } + } + + /** + * Associates a type and a service id if applicable. + * + * @param string $type + * @param string $id + */ + private function set($type, $id) + { + if (isset($this->definedTypes[$type]) || isset($this->notGuessableTypes[$type])) { + return; + } + + if (isset($this->types[$type])) { + if ($this->types[$type] === $id) { + return; + } + + unset($this->types[$type]); + $this->notGuessableTypes[$type] = true; + + return; + } + + $this->types[$type] = $id; + } + + /** + * Registers a definition for the type if possible or throws an exception. + * + * @param \ReflectionClass $typeHint + * @param string $id + * + * @return Reference A reference to the registered definition + * + * @throws RuntimeException + */ + private function createAutowiredDefinition(\ReflectionClass $typeHint, $id) + { + if (isset($this->notGuessableTypes[$typeHint->name]) || !$typeHint->isInstantiable()) { + throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s".', $typeHint->name, $id)); + } + + $argumentId = sprintf('autowired.%s', $typeHint->name); + + $argumentDefinition = $this->container->register($argumentId, $typeHint->name); + $argumentDefinition->setPublic(false); + + $this->populateAvailableType($argumentId, $argumentDefinition); + $this->completeDefinition($argumentId, $argumentDefinition); + + return new Reference($argumentId); + } + + /** + * Retrieves the reflection class associated with the given service. + * + * @param string $id + * @param Definition $definition + * + * @return \ReflectionClass|null + */ + private function getReflectionClass($id, Definition $definition) + { + if (isset($this->reflectionClasses[$id])) { + return $this->reflectionClasses[$id]; + } + + if (!$class = $definition->getClass()) { + return; + } + + $class = $this->container->getParameterBag()->resolveValue($class); + + try { + return $this->reflectionClasses[$id] = new \ReflectionClass($class); + } catch (\ReflectionException $reflectionException) { + // return null + } + } +} diff --git a/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php b/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php index 219e663..e54ee60 100644 --- a/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php +++ b/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php @@ -25,6 +25,7 @@ * - non synthetic, non abstract services always have a class set * - synthetic services are always public * - synthetic services are always of non-prototype scope + * - shared services are always of non-prototype scope * * @author Johannes M. Schmitt */ @@ -46,10 +47,15 @@ public function process(ContainerBuilder $container) } // synthetic service has non-prototype scope - if ($definition->isSynthetic() && ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) { + if ($definition->isSynthetic() && ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope(false)) { throw new RuntimeException(sprintf('A synthetic service ("%s") cannot be of scope "prototype".', $id)); } + // shared service has non-prototype scope + if ($definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope(false)) { + throw new RuntimeException(sprintf('A shared service ("%s") cannot be of scope "prototype".', $id)); + } + if ($definition->getFactory() && ($definition->getFactoryClass(false) || $definition->getFactoryService(false) || $definition->getFactoryMethod(false))) { throw new RuntimeException(sprintf('A service ("%s") can use either the old or the new factory syntax, not both.', $id)); } diff --git a/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php b/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php index 82202a9..ac4072a 100644 --- a/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php +++ b/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php @@ -46,10 +46,10 @@ public function process(ContainerBuilder $container) { $this->container = $container; - $children = $this->container->getScopeChildren(); + $children = $this->container->getScopeChildren(false); $ancestors = array(); - $scopes = $this->container->getScopes(); + $scopes = $this->container->getScopes(false); foreach ($scopes as $name => $parent) { $ancestors[$name] = array($parent); @@ -64,7 +64,7 @@ public function process(ContainerBuilder $container) } $this->currentId = $id; - $this->currentScope = $scope = $definition->getScope(); + $this->currentScope = $scope = $definition->getScope(false); if (ContainerInterface::SCOPE_CONTAINER === $scope) { $this->currentScopeChildren = array_keys($scopes); @@ -124,7 +124,7 @@ private function validateScope(Reference $reference, Definition $definition = nu return; } - if (!$reference->isStrict()) { + if (!$reference->isStrict(false)) { return; } @@ -132,7 +132,7 @@ private function validateScope(Reference $reference, Definition $definition = nu return; } - if ($this->currentScope === $scope = $definition->getScope()) { + if ($this->currentScope === $scope = $definition->getScope(false)) { return; } diff --git a/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php b/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php index ef0a19c..f80d705 100644 --- a/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php +++ b/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php @@ -19,18 +19,28 @@ * * @author Christophe Coevoet * @author Fabien Potencier + * @author Diego Saint Esteben */ class DecoratorServicePass implements CompilerPassInterface { public function process(ContainerBuilder $container) { + $definitions = new \SplPriorityQueue(); + $order = PHP_INT_MAX; + foreach ($container->getDefinitions() as $id => $definition) { if (!$decorated = $definition->getDecoratedService()) { continue; } + $definitions->insert(array($id, $definition), array($decorated[2], --$order)); + } + + foreach ($definitions as $arr) { + list($id, $definition) = $arr; + list($inner, $renamedId) = $definition->getDecoratedService(); + $definition->setDecoratedService(null); - list($inner, $renamedId) = $decorated; if (!$renamedId) { $renamedId = $id.'.inner'; } diff --git a/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php b/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php index 026700d..1beaaf0 100644 --- a/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php +++ b/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php @@ -48,27 +48,7 @@ public function process(ContainerBuilder $container) $this->formatter = $this->compiler->getLoggingFormatter(); $this->graph = $this->compiler->getServiceReferenceGraph(); - foreach ($container->getDefinitions() as $id => $definition) { - $this->currentId = $id; - - $definition->setArguments( - $this->inlineArguments($container, $definition->getArguments()) - ); - - $definition->setMethodCalls( - $this->inlineArguments($container, $definition->getMethodCalls()) - ); - - $definition->setProperties( - $this->inlineArguments($container, $definition->getProperties()) - ); - - $configurator = $this->inlineArguments($container, array($definition->getConfigurator())); - $definition->setConfigurator($configurator[0]); - - $factory = $this->inlineArguments($container, array($definition->getFactory())); - $definition->setFactory($factory[0]); - } + $container->setDefinitions($this->inlineArguments($container, $container->getDefinitions(), true)); } /** @@ -76,12 +56,16 @@ public function process(ContainerBuilder $container) * * @param ContainerBuilder $container The ContainerBuilder * @param array $arguments An array of arguments + * @param bool $isRoot If we are processing the root definitions or not * * @return array */ - private function inlineArguments(ContainerBuilder $container, array $arguments) + private function inlineArguments(ContainerBuilder $container, array $arguments, $isRoot = false) { foreach ($arguments as $k => $argument) { + if ($isRoot) { + $this->currentId = $k; + } if (is_array($argument)) { $arguments[$k] = $this->inlineArguments($container, $argument); } elseif ($argument instanceof Reference) { @@ -92,7 +76,7 @@ private function inlineArguments(ContainerBuilder $container, array $arguments) if ($this->isInlineableDefinition($container, $id, $definition = $container->getDefinition($id))) { $this->compiler->addLogMessage($this->formatter->formatInlineService($this, $id, $this->currentId)); - if (ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope()) { + if ($definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope(false)) { $arguments[$k] = $definition; } else { $arguments[$k] = clone $definition; @@ -102,6 +86,12 @@ private function inlineArguments(ContainerBuilder $container, array $arguments) $argument->setArguments($this->inlineArguments($container, $argument->getArguments())); $argument->setMethodCalls($this->inlineArguments($container, $argument->getMethodCalls())); $argument->setProperties($this->inlineArguments($container, $argument->getProperties())); + + $configurator = $this->inlineArguments($container, array($argument->getConfigurator())); + $argument->setConfigurator($configurator[0]); + + $factory = $this->inlineArguments($container, array($argument->getFactory())); + $argument->setFactory($factory[0]); } } @@ -119,7 +109,7 @@ private function inlineArguments(ContainerBuilder $container, array $arguments) */ private function isInlineableDefinition(ContainerBuilder $container, $id, Definition $definition) { - if (ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) { + if (!$definition->isShared() || ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope(false)) { return true; } @@ -152,6 +142,6 @@ private function isInlineableDefinition(ContainerBuilder $container, $id, Defini return false; } - return $container->getDefinition(reset($ids))->getScope() === $definition->getScope(); + return $container->getDefinition(reset($ids))->getScope(false) === $definition->getScope(false); } } diff --git a/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php b/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php index 6bd6161..db208fa 100644 --- a/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php +++ b/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php @@ -20,7 +20,7 @@ class LoggingFormatter { public function formatRemoveService(CompilerPassInterface $pass, $id, $reason) { - return $this->format($pass, sprintf('Removed service "%s"; reason: %s', $id, $reason)); + return $this->format($pass, sprintf('Removed service "%s"; reason: %s.', $id, $reason)); } public function formatInlineService(CompilerPassInterface $pass, $id, $target) diff --git a/vendor/symfony/dependency-injection/Compiler/PassConfig.php b/vendor/symfony/dependency-injection/Compiler/PassConfig.php index 2849dfe..246529d 100644 --- a/vendor/symfony/dependency-injection/Compiler/PassConfig.php +++ b/vendor/symfony/dependency-injection/Compiler/PassConfig.php @@ -50,6 +50,7 @@ public function __construct() new CheckDefinitionValidityPass(), new ResolveReferencesToAliasesPass(), new ResolveInvalidReferencesPass(), + new AutowirePass(), new AnalyzeServiceReferencesPass(true), new CheckCircularReferencesPass(), new CheckReferenceValidityPass(), diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php index 3fc6a11..62ed326 100644 --- a/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php +++ b/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php @@ -21,12 +21,13 @@ * merged Definition instance. * * @author Johannes M. Schmitt + * @author Nicolas Grekas */ class ResolveDefinitionTemplatesPass implements CompilerPassInterface { - private $container; private $compiler; private $formatter; + private $currentId; /** * Process the ContainerBuilder to replace DefinitionDecorator instances with their real Definition instances. @@ -35,44 +36,80 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { - $this->container = $container; $this->compiler = $container->getCompiler(); $this->formatter = $this->compiler->getLoggingFormatter(); - foreach ($container->getDefinitions() as $id => $definition) { - // yes, we are specifically fetching the definition from the - // container to ensure we are not operating on stale data - $definition = $container->getDefinition($id); - if (!$definition instanceof DefinitionDecorator || $definition->isAbstract()) { - continue; - } + $container->setDefinitions($this->resolveArguments($container, $container->getDefinitions(), true)); + } - $this->resolveDefinition($id, $definition); + /** + * Resolves definition decorator arguments. + * + * @param ContainerBuilder $container The ContainerBuilder + * @param array $arguments An array of arguments + * @param bool $isRoot If we are processing the root definitions or not + * + * @return array + */ + private function resolveArguments(ContainerBuilder $container, array $arguments, $isRoot = false) + { + foreach ($arguments as $k => $argument) { + if ($isRoot) { + // yes, we are specifically fetching the definition from the + // container to ensure we are not operating on stale data + $arguments[$k] = $argument = $container->getDefinition($k); + $this->currentId = $k; + } + if (is_array($argument)) { + $arguments[$k] = $this->resolveArguments($container, $argument); + } elseif ($argument instanceof Definition) { + if ($argument instanceof DefinitionDecorator) { + $arguments[$k] = $argument = $this->resolveDefinition($container, $argument); + if ($isRoot) { + $container->setDefinition($k, $argument); + } + } + $argument->setArguments($this->resolveArguments($container, $argument->getArguments())); + $argument->setMethodCalls($this->resolveArguments($container, $argument->getMethodCalls())); + $argument->setProperties($this->resolveArguments($container, $argument->getProperties())); + + $configurator = $this->resolveArguments($container, array($argument->getConfigurator())); + $argument->setConfigurator($configurator[0]); + + $factory = $this->resolveArguments($container, array($argument->getFactory())); + $argument->setFactory($factory[0]); + } } + + return $arguments; } /** * Resolves the definition. * - * @param string $id The definition identifier + * @param ContainerBuilder $container The ContainerBuilder * @param DefinitionDecorator $definition * * @return Definition * * @throws \RuntimeException When the definition is invalid */ - private function resolveDefinition($id, DefinitionDecorator $definition) + private function resolveDefinition(ContainerBuilder $container, DefinitionDecorator $definition) { - if (!$this->container->hasDefinition($parent = $definition->getParent())) { - throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $id)); + if (!$container->hasDefinition($parent = $definition->getParent())) { + throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $this->currentId)); } - $parentDef = $this->container->getDefinition($parent); + $parentDef = $container->getDefinition($parent); if ($parentDef instanceof DefinitionDecorator) { - $parentDef = $this->resolveDefinition($parent, $parentDef); + $id = $this->currentId; + $this->currentId = $parent; + $parentDef = $this->resolveDefinition($container, $parentDef); + $container->setDefinition($parent, $parentDef); + $this->currentId = $id; } - $this->compiler->addLogMessage($this->formatter->formatResolveInheritance($this, $id, $parent)); + $this->compiler->addLogMessage($this->formatter->formatResolveInheritance($this, $this->currentId, $parent)); $def = new Definition(); // merge in parent definition @@ -81,6 +118,7 @@ private function resolveDefinition($id, DefinitionDecorator $definition) $def->setArguments($parentDef->getArguments()); $def->setMethodCalls($parentDef->getMethodCalls()); $def->setProperties($parentDef->getProperties()); + $def->setAutowiringTypes($parentDef->getAutowiringTypes()); if ($parentDef->getFactoryClass(false)) { $def->setFactoryClass($parentDef->getFactoryClass(false)); } @@ -90,6 +128,9 @@ private function resolveDefinition($id, DefinitionDecorator $definition) if ($parentDef->getFactoryService(false)) { $def->setFactoryService($parentDef->getFactoryService(false)); } + if ($parentDef->isDeprecated()) { + $def->setDeprecated(true, $parentDef->getDeprecationMessage('%service_id%')); + } $def->setFactory($parentDef->getFactory()); $def->setConfigurator($parentDef->getConfigurator()); $def->setFile($parentDef->getFile()); @@ -125,6 +166,9 @@ private function resolveDefinition($id, DefinitionDecorator $definition) if (isset($changes['lazy'])) { $def->setLazy($definition->isLazy()); } + if (isset($changes['deprecated'])) { + $def->setDeprecated($definition->isDeprecated(), $definition->getDeprecationMessage('%service_id%')); + } if (isset($changes['decorated_service'])) { $decoratedService = $definition->getDecoratedService(); if (null === $decoratedService) { @@ -159,14 +203,16 @@ private function resolveDefinition($id, DefinitionDecorator $definition) $def->setMethodCalls(array_merge($def->getMethodCalls(), $calls)); } + // merge autowiring types + foreach ($definition->getAutowiringTypes() as $autowiringType) { + $def->addAutowiringType($autowiringType); + } + // these attributes are always taken from the child $def->setAbstract($definition->isAbstract()); - $def->setScope($definition->getScope()); + $def->setScope($definition->getScope(false), false); $def->setTags($definition->getTags()); - // set new definition on container - $this->container->setDefinition($id, $def); - return $def; } } diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php index c90d76f..3111d7f 100644 --- a/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php +++ b/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php @@ -68,7 +68,7 @@ private function processArguments(array $arguments) $defId = $this->getDefinitionId($id = (string) $argument); if ($defId !== $id) { - $arguments[$k] = new Reference($defId, $argument->getInvalidBehavior(), $argument->isStrict()); + $arguments[$k] = new Reference($defId, $argument->getInvalidBehavior(), $argument->isStrict(false)); } } } diff --git a/vendor/symfony/dependency-injection/Container.php b/vendor/symfony/dependency-injection/Container.php index 510d030..e11e3df 100644 --- a/vendor/symfony/dependency-injection/Container.php +++ b/vendor/symfony/dependency-injection/Container.php @@ -13,6 +13,7 @@ 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\Exception\ServiceNotFoundException; use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException; @@ -58,7 +59,7 @@ * @author Fabien Potencier * @author Johannes M. Schmitt */ -class Container implements IntrospectableContainerInterface +class Container implements IntrospectableContainerInterface, ResettableContainerInterface { /** * @var ParameterBagInterface @@ -164,6 +165,8 @@ public function setParameter($name, $value) * Setting a service to null resets the service: has() returns false and get() * behaves in the same way as if the service was never created. * + * Note: The $scope parameter is deprecated since version 2.8 and will be removed in 3.0. + * * @param string $id The service identifier * @param object $service The service instance * @param string $scope The scope of the service @@ -173,6 +176,10 @@ public function setParameter($name, $value) */ public function set($id, $service, $scope = self::SCOPE_CONTAINER) { + if (!in_array($scope, array('container', 'request')) || ('request' === $scope && 'request' !== $id)) { + @trigger_error('The concept of container scopes is deprecated since version 2.8 and will be removed in 3.0. Omit the third parameter.', E_USER_DEPRECATED); + } + if (self::SCOPE_PROTOTYPE === $scope) { throw new InvalidArgumentException(sprintf('You cannot set service "%s" of scope "prototype".', $id)); } @@ -305,10 +312,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE $service = $this->$method(); } catch (\Exception $e) { unset($this->loading[$id]); - - if (array_key_exists($id, $this->services)) { - unset($this->services[$id]); - } + unset($this->services[$id]); if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) { return; @@ -348,6 +352,18 @@ public function initialized($id) } /** + * {@inheritdoc} + */ + public function reset() + { + if (!empty($this->scopedServices)) { + throw new LogicException('Resetting the container is not allowed when a scope is active.'); + } + + $this->services = array(); + } + + /** * Gets all service ids. * * @return array An array of all defined service ids @@ -373,9 +389,15 @@ public function getServiceIds() * * @throws RuntimeException When the parent scope is inactive * @throws InvalidArgumentException When the scope does not exist + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function enterScope($name) { + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + if (!isset($this->scopes[$name])) { throw new InvalidArgumentException(sprintf('The scope "%s" does not exist.', $name)); } @@ -419,9 +441,15 @@ public function enterScope($name) * @param string $name The name of the scope to leave * * @throws InvalidArgumentException if the scope is not active + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function leaveScope($name) { + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + if (!isset($this->scopedServices[$name])) { throw new InvalidArgumentException(sprintf('The scope "%s" is not active.', $name)); } @@ -464,12 +492,17 @@ public function leaveScope($name) * @param ScopeInterface $scope * * @throws InvalidArgumentException + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function addScope(ScopeInterface $scope) { $name = $scope->getName(); $parentScope = $scope->getParentName(); + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } if (self::SCOPE_CONTAINER === $name || self::SCOPE_PROTOTYPE === $name) { throw new InvalidArgumentException(sprintf('The scope "%s" is reserved.', $name)); } @@ -496,9 +529,15 @@ public function addScope(ScopeInterface $scope) * @param string $name The name of the scope * * @return bool + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function hasScope($name) { + if ('request' !== $name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + return isset($this->scopes[$name]); } @@ -510,9 +549,13 @@ public function hasScope($name) * @param string $name * * @return bool + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function isScopeActive($name) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + return isset($this->scopedServices[$name]); } @@ -539,4 +582,8 @@ public static function underscore($id) { return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($id, '_', '.'))); } + + private function __clone() + { + } } diff --git a/vendor/symfony/dependency-injection/ContainerAware.php b/vendor/symfony/dependency-injection/ContainerAware.php index af977fe..5686bf8 100644 --- a/vendor/symfony/dependency-injection/ContainerAware.php +++ b/vendor/symfony/dependency-injection/ContainerAware.php @@ -15,6 +15,8 @@ * A simple implementation of ContainerAwareInterface. * * @author Fabien Potencier + * + * @deprecated since version 2.8, to be removed in 3.0. Use the ContainerAwareTrait instead. */ abstract class ContainerAware implements ContainerAwareInterface { @@ -24,9 +26,9 @@ protected $container; /** - * Sets the Container associated with this Controller. + * Sets the container. * - * @param ContainerInterface $container A ContainerInterface instance + * @param ContainerInterface|null $container A ContainerInterface instance or null */ public function setContainer(ContainerInterface $container = null) { diff --git a/vendor/symfony/dependency-injection/ContainerAwareInterface.php b/vendor/symfony/dependency-injection/ContainerAwareInterface.php index 7007265..fe301b6 100644 --- a/vendor/symfony/dependency-injection/ContainerAwareInterface.php +++ b/vendor/symfony/dependency-injection/ContainerAwareInterface.php @@ -19,7 +19,7 @@ interface ContainerAwareInterface { /** - * Sets the Container. + * Sets the container. * * @param ContainerInterface|null $container A ContainerInterface instance or null */ diff --git a/vendor/symfony/dependency-injection/ContainerAwareTrait.php b/vendor/symfony/dependency-injection/ContainerAwareTrait.php index 57280aa..ccf064f 100644 --- a/vendor/symfony/dependency-injection/ContainerAwareTrait.php +++ b/vendor/symfony/dependency-injection/ContainerAwareTrait.php @@ -24,9 +24,9 @@ protected $container; /** - * Sets the Container associated with this Controller. + * Sets the container. * - * @param ContainerInterface $container A ContainerInterface instance + * @param ContainerInterface|null $container A ContainerInterface instance or null */ public function setContainer(ContainerInterface $container = null) { diff --git a/vendor/symfony/dependency-injection/ContainerBuilder.php b/vendor/symfony/dependency-injection/ContainerBuilder.php index d692873..1347f99 100644 --- a/vendor/symfony/dependency-injection/ContainerBuilder.php +++ b/vendor/symfony/dependency-injection/ContainerBuilder.php @@ -89,6 +89,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface private $expressionLanguageProviders = array(); /** + * @var string[] with tag names used by findTaggedServiceIds + */ + private $usedTags = array(); + + /** * Sets the track resources flag. * * If you are not using the loaders and therefore don't want @@ -330,9 +335,15 @@ public function getCompiler() * Returns all Scopes. * * @return array An array of scopes + * + * @deprecated since version 2.8, to be removed in 3.0. */ - public function getScopes() + public function getScopes($triggerDeprecationError = true) { + if ($triggerDeprecationError) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + return $this->scopes; } @@ -340,15 +351,23 @@ public function getScopes() * Returns all Scope children. * * @return array An array of scope children. + * + * @deprecated since version 2.8, to be removed in 3.0. */ - public function getScopeChildren() + public function getScopeChildren($triggerDeprecationError = true) { + if ($triggerDeprecationError) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + return $this->scopeChildren; } /** * Sets a service. * + * Note: The $scope parameter is deprecated since version 2.8 and will be removed in 3.0. + * * @param string $id The service identifier * @param object $service The service instance * @param string $scope The scope @@ -843,6 +862,10 @@ public function createService(Definition $definition, $id, $tryProxy = true) throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id)); } + if ($definition->isDeprecated()) { + @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED); + } + if ($tryProxy && $definition->isLazy()) { $container = $this; @@ -876,6 +899,14 @@ public function createService(Definition $definition, $id, $tryProxy = true) } $service = call_user_func_array($factory, $arguments); + + if (!$definition->isDeprecated() && is_array($factory) && is_string($factory[0])) { + $r = new \ReflectionClass($factory[0]); + + if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) { + @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED); + } + } } elseif (null !== $definition->getFactoryMethod(false)) { if (null !== $definition->getFactoryClass(false)) { $factory = $parameterBag->resolveValue($definition->getFactoryClass(false)); @@ -890,6 +921,10 @@ public function createService(Definition $definition, $id, $tryProxy = true) $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass())); $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments); + + if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) { + @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED); + } } if ($tryProxy || !$definition->isLazy()) { @@ -901,7 +936,7 @@ public function createService(Definition $definition, $id, $tryProxy = true) $this->callMethod($service, $call); } - $properties = $this->resolveServices($parameterBag->resolveValue($definition->getProperties())); + $properties = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getProperties()))); foreach ($properties as $name => $value) { $service->$name = $value; } @@ -972,6 +1007,7 @@ public function resolveServices($value) */ public function findTaggedServiceIds($name) { + $this->usedTags[] = $name; $tags = array(); foreach ($this->getDefinitions() as $id => $definition) { if ($definition->hasTag($name)) { @@ -997,6 +1033,16 @@ public function findTags() return array_unique($tags); } + /** + * Returns all tags not queried by findTaggedServiceIds. + * + * @return string[] An array of tags + */ + public function findUnusedTags() + { + return array_values(array_diff($this->findTags(), $this->usedTags)); + } + public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider) { $this->expressionLanguageProviders[] = $provider; @@ -1088,7 +1134,7 @@ private function callMethod($service, $call) } } - call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->resolveValue($call[1]))); + call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1])))); } /** @@ -1102,7 +1148,7 @@ private function callMethod($service, $call) */ private function shareService(Definition $definition, $service, $id) { - if (self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) { + if ($definition->isShared() && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope(false)) { if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) { throw new InactiveScopeException($id, $scope); } diff --git a/vendor/symfony/dependency-injection/ContainerInterface.php b/vendor/symfony/dependency-injection/ContainerInterface.php index 80d6414..d9076eb 100644 --- a/vendor/symfony/dependency-injection/ContainerInterface.php +++ b/vendor/symfony/dependency-injection/ContainerInterface.php @@ -32,6 +32,8 @@ /** * Sets a service. * + * Note: The $scope parameter is deprecated since version 2.8 and will be removed in 3.0. + * * @param string $id The service identifier * @param object $service The service instance * @param string $scope The scope of the service @@ -94,6 +96,8 @@ public function setParameter($name, $value); * Enters the given scope. * * @param string $name + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function enterScope($name); @@ -101,6 +105,8 @@ public function enterScope($name); * Leaves the current scope, and re-enters the parent scope. * * @param string $name + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function leaveScope($name); @@ -108,6 +114,8 @@ public function leaveScope($name); * Adds a scope to the container. * * @param ScopeInterface $scope + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function addScope(ScopeInterface $scope); @@ -117,6 +125,8 @@ public function addScope(ScopeInterface $scope); * @param string $name * * @return bool + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function hasScope($name); @@ -128,6 +138,8 @@ public function hasScope($name); * @param string $name * * @return bool + * + * @deprecated since version 2.8, to be removed in 3.0. */ public function isScopeActive($name); } diff --git a/vendor/symfony/dependency-injection/Definition.php b/vendor/symfony/dependency-injection/Definition.php index 777f4a6..6b7138e 100644 --- a/vendor/symfony/dependency-injection/Definition.php +++ b/vendor/symfony/dependency-injection/Definition.php @@ -27,6 +27,9 @@ class Definition private $factoryClass; private $factoryMethod; private $factoryService; + private $shared = true; + private $deprecated = false; + private $deprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.'; private $scope = ContainerInterface::SCOPE_CONTAINER; private $properties = array(); private $calls = array(); @@ -38,6 +41,8 @@ class Definition private $synchronized = false; private $lazy = false; private $decoratedService; + private $autowired = false; + private $autowiringTypes = array(); protected $arguments; @@ -139,12 +144,13 @@ public function setFactoryMethod($factoryMethod) * * @param null|string $id The decorated service id, use null to remove decoration * @param null|string $renamedId The new decorated service id + * @param int $priority The priority of decoration * * @return Definition The current instance * * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals. */ - public function setDecoratedService($id, $renamedId = null) + public function setDecoratedService($id, $renamedId = null, $priority = 0) { if ($renamedId && $id == $renamedId) { throw new \InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id)); @@ -153,7 +159,7 @@ public function setDecoratedService($id, $renamedId = null) if (null === $id) { $this->decoratedService = null; } else { - $this->decoratedService = array($id, $renamedId); + $this->decoratedService = array($id, $renamedId, (int) $priority); } return $this; @@ -162,7 +168,7 @@ public function setDecoratedService($id, $renamedId = null) /** * Gets the service that decorates this service. * - * @return null|array An array composed of the decorated service id and the new id for it, null if no service is decorated + * @return null|array An array composed of the decorated service id, the new id for it and the priority of decoration, null if no service is decorated */ public function getDecoratedService() { @@ -495,9 +501,7 @@ public function hasTag($name) */ public function clearTag($name) { - if (isset($this->tags[$name])) { - unset($this->tags[$name]); - } + unset($this->tags[$name]); return $this; } @@ -539,14 +543,48 @@ public function getFile() } /** + * Sets if the service must be shared or not. + * + * @param bool $shared Whether the service must be shared or not + * + * @return Definition The current instance + */ + public function setShared($shared) + { + $this->shared = (bool) $shared; + + return $this; + } + + /** + * Whether this service is shared. + * + * @return bool + */ + public function isShared() + { + return $this->shared; + } + + /** * Sets the scope of the service. * * @param string $scope Whether the service must be shared or not * * @return Definition The current instance + * + * @deprecated since version 2.8, to be removed in 3.0. */ - public function setScope($scope) + public function setScope($scope, $triggerDeprecationError = true) { + if ($triggerDeprecationError) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + + if (ContainerInterface::SCOPE_PROTOTYPE === $scope) { + $this->setShared(false); + } + $this->scope = $scope; return $this; @@ -556,9 +594,15 @@ public function setScope($scope) * Returns the scope of the service. * * @return string + * + * @deprecated since version 2.8, to be removed in 3.0. */ - public function getScope() + public function getScope($triggerDeprecationError = true) { + if ($triggerDeprecationError) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + return $this->scope; } @@ -699,6 +743,59 @@ public function isAbstract() } /** + * Whether this definition is deprecated, that means it should not be called + * anymore. + * + * @param bool $status + * @param string $template Template message to use if the definition is deprecated + * + * @return Definition the current instance + * + * @throws InvalidArgumentException When the message template is invalid. + */ + public function setDeprecated($status = true, $template = null) + { + if (null !== $template) { + if (preg_match('#[\r\n]|\*/#', $template)) { + throw new InvalidArgumentException('Invalid characters found in deprecation template.'); + } + + if (false === strpos($template, '%service_id%')) { + throw new InvalidArgumentException('The deprecation template must contain the "%service_id%" placeholder.'); + } + + $this->deprecationTemplate = $template; + } + + $this->deprecated = (bool) $status; + + return $this; + } + + /** + * Whether this definition is deprecated, that means it should not be called + * anymore. + * + * @return bool + */ + public function isDeprecated() + { + return $this->deprecated; + } + + /** + * Message to use if this definition is deprecated. + * + * @param string $id Service id relying on this definition + * + * @return string + */ + public function getDeprecationMessage($id) + { + return str_replace('%service_id%', $id, $this->deprecationTemplate); + } + + /** * Sets a configurator to call after the service is fully initialized. * * @param callable $callable A PHP callable @@ -721,4 +818,96 @@ public function getConfigurator() { return $this->configurator; } + + /** + * Sets types that will default to this definition. + * + * @param string[] $types + * + * @return Definition The current instance + */ + public function setAutowiringTypes(array $types) + { + $this->autowiringTypes = array(); + + foreach ($types as $type) { + $this->autowiringTypes[$type] = true; + } + + return $this; + } + + /** + * Is the definition autowired? + * + * @return bool + */ + public function isAutowired() + { + return $this->autowired; + } + + /** + * Sets autowired. + * + * @param $autowired + * + * @return Definition The current instance + */ + public function setAutowired($autowired) + { + $this->autowired = $autowired; + + return $this; + } + + /** + * Gets autowiring types that will default to this definition. + * + * @return string[] + */ + public function getAutowiringTypes() + { + return array_keys($this->autowiringTypes); + } + + /** + * Adds a type that will default to this definition. + * + * @param string $type + * + * @return Definition The current instance + */ + public function addAutowiringType($type) + { + $this->autowiringTypes[$type] = true; + + return $this; + } + + /** + * Removes a type. + * + * @param string $type + * + * @return Definition The current instance + */ + public function removeAutowiringType($type) + { + unset($this->autowiringTypes[$type]); + + return $this; + } + + /** + * Will this definition default for the given type? + * + * @param string $type + * + * @return bool + */ + public function hasAutowiringType($type) + { + return isset($this->autowiringTypes[$type]); + } } diff --git a/vendor/symfony/dependency-injection/DefinitionDecorator.php b/vendor/symfony/dependency-injection/DefinitionDecorator.php index 334127a..e9413d9 100644 --- a/vendor/symfony/dependency-injection/DefinitionDecorator.php +++ b/vendor/symfony/dependency-injection/DefinitionDecorator.php @@ -150,11 +150,21 @@ public function setLazy($boolean) /** * {@inheritdoc} */ - public function setDecoratedService($id, $renamedId = null) + public function setDecoratedService($id, $renamedId = null, $priority = 0) { $this->changes['decorated_service'] = true; - return parent::setDecoratedService($id, $renamedId); + return parent::setDecoratedService($id, $renamedId, $priority); + } + + /** + * {@inheritdoc} + */ + public function setDeprecated($boolean = true, $template = null) + { + $this->changes['deprecated'] = true; + + return parent::setDeprecated($boolean, $template); } /** diff --git a/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php b/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php index f69d1e9..9710e8b 100644 --- a/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php +++ b/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php @@ -177,7 +177,7 @@ private function findNodes() } catch (ParameterNotFoundException $e) { } - $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], array('style' => ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope() ? 'filled' : 'dotted'))); + $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], array('style' => $definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope(false) ? 'filled' : 'dotted'))); $container->setDefinition($id, new Definition('stdClass')); } @@ -205,7 +205,7 @@ private function cloneContainer() $container->setDefinitions($this->container->getDefinitions()); $container->setAliases($this->container->getAliases()); $container->setResources($this->container->getResources()); - foreach ($this->container->getScopes() as $scope => $parentScope) { + foreach ($this->container->getScopes(false) as $scope => $parentScope) { $container->addScope(new Scope($scope, $parentScope)); } foreach ($this->container->getExtensions() as $extension) { diff --git a/vendor/symfony/dependency-injection/Dumper/PhpDumper.php b/vendor/symfony/dependency-injection/Dumper/PhpDumper.php index bb3df8b..6b8d952 100644 --- a/vendor/symfony/dependency-injection/Dumper/PhpDumper.php +++ b/vendor/symfony/dependency-injection/Dumper/PhpDumper.php @@ -382,9 +382,9 @@ private function addServiceInstance($id, $definition) $isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition); $instantiation = ''; - if (!$isProxyCandidate && ContainerInterface::SCOPE_CONTAINER === $definition->getScope()) { + if (!$isProxyCandidate && $definition->isShared() && ContainerInterface::SCOPE_CONTAINER === $definition->getScope(false)) { $instantiation = "\$this->services['$id'] = ".($simple ? '' : '$instance'); - } elseif (!$isProxyCandidate && ContainerInterface::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) { + } elseif (!$isProxyCandidate && $definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $scope = $definition->getScope(false)) { $instantiation = "\$this->services['$id'] = \$this->scopedServices['$scope']['$id'] = ".($simple ? '' : '$instance'); } elseif (!$simple) { $instantiation = '$instance'; @@ -578,7 +578,7 @@ private function addService($id, $definition) $return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryService(false), $definition->getFactoryMethod(false)); } - $scope = $definition->getScope(); + $scope = $definition->getScope(false); if (!in_array($scope, array(ContainerInterface::SCOPE_CONTAINER, ContainerInterface::SCOPE_PROTOTYPE))) { if ($return && 0 === strpos($return[count($return) - 1], '@return')) { $return[] = ''; @@ -586,10 +586,18 @@ private function addService($id, $definition) $return[] = sprintf("@throws InactiveScopeException when the '%s' service is requested while the '%s' scope is not active", $id, $scope); } - $return = implode("\n * ", $return); + if ($definition->isDeprecated()) { + if ($return && 0 === strpos($return[count($return) - 1], '@return')) { + $return[] = ''; + } + + $return[] = sprintf('@deprecated %s', $definition->getDeprecationMessage($id)); + } + + $return = str_replace("\n * \n", "\n *\n", implode("\n * ", $return)); $doc = ''; - if (ContainerInterface::SCOPE_PROTOTYPE !== $scope) { + if ($definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $scope) { $doc .= <<isAutowired()) { + $doc = <<isLazy()) { $lazyInitialization = '$lazyLoad = true'; $lazyInitializationDoc = "\n * @param bool \$lazyLoad whether to try lazy-loading the service with a proxy\n *"; @@ -646,6 +663,10 @@ private function addService($id, $definition) if ($definition->isSynthetic()) { $code .= sprintf(" throw new RuntimeException('You have requested a synthetic service (\"%s\"). The DIC does not know how to construct this service.');\n }\n", $id); } else { + if ($definition->isDeprecated()) { + $code .= sprintf(" @trigger_error(%s, E_USER_DEPRECATED);\n\n", var_export($definition->getDeprecationMessage($id), true)); + } + $code .= $this->addServiceInclude($id, $definition). $this->addServiceLocalTempVariables($id, $definition). @@ -860,10 +881,10 @@ public function __construct() EOF; - if (count($scopes = $this->container->getScopes()) > 0) { + if (count($scopes = $this->container->getScopes(false)) > 0) { $code .= "\n"; $code .= ' $this->scopes = '.$this->dumpValue($scopes).";\n"; - $code .= ' $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren()).";\n"; + $code .= ' $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren(false)).";\n"; } $code .= $this->addMethodMap(); @@ -907,9 +928,9 @@ public function __construct() EOF; $code .= "\n"; - if (count($scopes = $this->container->getScopes()) > 0) { + if (count($scopes = $this->container->getScopes(false)) > 0) { $code .= ' $this->scopes = '.$this->dumpValue($scopes).";\n"; - $code .= ' $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren()).";\n"; + $code .= ' $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren(false)).";\n"; } else { $code .= " \$this->scopes = array();\n"; $code .= " \$this->scopeChildren = array();\n"; diff --git a/vendor/symfony/dependency-injection/Dumper/XmlDumper.php b/vendor/symfony/dependency-injection/Dumper/XmlDumper.php index bd8e200..07aad3f 100644 --- a/vendor/symfony/dependency-injection/Dumper/XmlDumper.php +++ b/vendor/symfony/dependency-injection/Dumper/XmlDumper.php @@ -126,7 +126,10 @@ private function addService($definition, $id, \DOMElement $parent) if ($definition->getFactoryService(false)) { $service->setAttribute('factory-service', $definition->getFactoryService(false)); } - if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) { + if (!$definition->isShared()) { + $service->setAttribute('shared', 'false'); + } + if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope(false)) { $service->setAttribute('scope', $scope); } if (!$definition->isPublic()) { @@ -142,11 +145,14 @@ private function addService($definition, $id, \DOMElement $parent) $service->setAttribute('lazy', 'true'); } if (null !== $decorated = $definition->getDecoratedService()) { - list($decorated, $renamedId) = $decorated; + list($decorated, $renamedId, $priority) = $decorated; $service->setAttribute('decorates', $decorated); if (null !== $renamedId) { $service->setAttribute('decoration-inner-name', $renamedId); } + if (0 !== $priority) { + $service->setAttribute('decoration-priority', $priority); + } } foreach ($definition->getTags() as $name => $tags) { @@ -191,6 +197,24 @@ private function addService($definition, $id, \DOMElement $parent) $service->appendChild($factory); } + if ($definition->isDeprecated()) { + $deprecated = $this->document->createElement('deprecated'); + $deprecated->appendChild($this->document->createTextNode($definition->getDeprecationMessage('%service_id%'))); + + $service->appendChild($deprecated); + } + + if ($definition->isAutowired()) { + $service->setAttribute('autowire', 'true'); + } + + foreach ($definition->getAutowiringTypes() as $autowiringTypeValue) { + $autowiringType = $this->document->createElement('autowiring-type'); + $autowiringType->appendChild($this->document->createTextNode($autowiringTypeValue)); + + $service->appendChild($autowiringType); + } + if ($callable = $definition->getConfigurator()) { $configurator = $this->document->createElement('configurator'); @@ -283,7 +307,7 @@ private function convertParameters($parameters, $type, \DOMElement $parent, $key } elseif ($behaviour == ContainerInterface::IGNORE_ON_INVALID_REFERENCE) { $element->setAttribute('on-invalid', 'ignore'); } - if (!$value->isStrict()) { + if (!$value->isStrict(false)) { $element->setAttribute('strict', 'false'); } } elseif ($value instanceof Definition) { diff --git a/vendor/symfony/dependency-injection/Dumper/YamlDumper.php b/vendor/symfony/dependency-injection/Dumper/YamlDumper.php index e8e108c..e44fc20 100644 --- a/vendor/symfony/dependency-injection/Dumper/YamlDumper.php +++ b/vendor/symfony/dependency-injection/Dumper/YamlDumper.php @@ -100,6 +100,22 @@ private function addService($id, $definition) $code .= sprintf(" synchronized: true\n"); } + if ($definition->isDeprecated()) { + $code .= sprintf(" deprecated: %s\n", $definition->getDeprecationMessage('%service_id%')); + } + + if ($definition->isAutowired()) { + $code .= " autowire: true\n"; + } + + $autowiringTypesCode = ''; + foreach ($definition->getAutowiringTypes() as $autowiringType) { + $autowiringTypesCode .= sprintf(" - %s\n", $this->dumper->dump($autowiringType)); + } + if ($autowiringTypesCode) { + $code .= sprintf(" autowiring_types:\n%s", $autowiringTypesCode); + } + if ($definition->getFactoryClass(false)) { $code .= sprintf(" factory_class: %s\n", $definition->getFactoryClass(false)); } @@ -128,16 +144,23 @@ private function addService($id, $definition) $code .= sprintf(" calls:\n%s\n", $this->dumper->dump($this->dumpValue($definition->getMethodCalls()), 1, 12)); } - if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) { + if (!$definition->isShared()) { + $code .= " shared: false\n"; + } + + if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope(false)) { $code .= sprintf(" scope: %s\n", $scope); } if (null !== $decorated = $definition->getDecoratedService()) { - list($decorated, $renamedId) = $decorated; + list($decorated, $renamedId, $priority) = $decorated; $code .= sprintf(" decorates: %s\n", $decorated); if (null !== $renamedId) { $code .= sprintf(" decoration_inner_name: %s\n", $renamedId); } + if (0 !== $priority) { + $code .= sprintf(" decoration_priority: %s\n", $priority); + } } if ($callable = $definition->getFactory()) { diff --git a/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php b/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php index e630a1e..4aa0059 100644 --- a/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php +++ b/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php @@ -16,6 +16,8 @@ * for containers, allowing logic to be implemented based on a Container's state. * * @author Evan Villemez + * + * @deprecated since version 2.8, to be merged with ContainerInterface in 3.0. */ interface IntrospectableContainerInterface extends ContainerInterface { diff --git a/vendor/symfony/dependency-injection/Loader/DirectoryLoader.php b/vendor/symfony/dependency-injection/Loader/DirectoryLoader.php new file mode 100644 index 0000000..ffb8853 --- /dev/null +++ b/vendor/symfony/dependency-injection/Loader/DirectoryLoader.php @@ -0,0 +1,56 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\DependencyInjection\Loader; + +use Symfony\Component\Config\Resource\DirectoryResource; + +/** + * DirectoryLoader is a recursive loader to go through directories. + * + * @author Sebastien Lavoie + */ +class DirectoryLoader extends FileLoader +{ + /** + * {@inheritdoc} + */ + public function load($file, $type = null) + { + $file = rtrim($file, '/'); + $path = $this->locator->locate($file); + $this->container->addResource(new DirectoryResource($path)); + + foreach (scandir($path) as $dir) { + if ('.' !== $dir[0]) { + if (is_dir($path.'/'.$dir)) { + $dir .= '/'; // append / to allow recursion + } + + $this->setCurrentDir($path); + + $this->import($dir, null, false, $path); + } + } + } + + /** + * {@inheritdoc} + */ + public function supports($resource, $type = null) + { + if ('directory' === $type) { + return true; + } + + return null === $type && is_string($resource) && '/' === substr($resource, -1); + } +} diff --git a/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php b/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php index ebe330b..7fb9897 100644 --- a/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php +++ b/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php @@ -147,7 +147,7 @@ private function parseDefinition(\DOMElement $service, $file) $definition = new Definition(); } - foreach (array('class', 'scope', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) { + foreach (array('class', 'shared', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) { if ($value = $service->getAttribute($key)) { if (in_array($key, array('factory-class', 'factory-method', 'factory-service'))) { @trigger_error(sprintf('The "%s" attribute of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED); @@ -157,6 +157,20 @@ private function parseDefinition(\DOMElement $service, $file) } } + if ($value = $service->getAttribute('autowire')) { + $definition->setAutowired(XmlUtils::phpize($value)); + } + + if ($value = $service->getAttribute('scope')) { + $triggerDeprecation = 'request' !== (string) $service->getAttribute('id'); + + if ($triggerDeprecation) { + @trigger_error(sprintf('The "scope" attribute of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED); + } + + $definition->setScope(XmlUtils::phpize($value), false); + } + if ($value = $service->getAttribute('synchronized')) { $triggerDeprecation = 'request' !== (string) $service->getAttribute('id'); @@ -171,6 +185,10 @@ private function parseDefinition(\DOMElement $service, $file) $definition->setFile($files[0]->nodeValue); } + if ($deprecated = $this->getChildren($service, 'deprecated')) { + $definition->setDeprecated(true, $deprecated[0]->nodeValue); + } + $definition->setArguments($this->getArgumentsAsPhp($service, 'argument')); $definition->setProperties($this->getArgumentsAsPhp($service, 'property')); @@ -233,9 +251,14 @@ private function parseDefinition(\DOMElement $service, $file) $definition->addTag($tag->getAttribute('name'), $parameters); } + foreach ($this->getChildren($service, 'autowiring-type') as $type) { + $definition->addAutowiringType($type->textContent); + } + if ($value = $service->getAttribute('decorates')) { $renameId = $service->hasAttribute('decoration-inner-name') ? $service->getAttribute('decoration-inner-name') : null; - $definition->setDecoratedService($value, $renameId); + $priority = $service->hasAttribute('decoration-priority') ? $service->getAttribute('decoration-priority') : 0; + $definition->setDecoratedService($value, $renameId, $priority); } return $definition; diff --git a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php index 5b3fb46..3039885 100644 --- a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php +++ b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php @@ -164,8 +164,15 @@ private function parseDefinition($id, $service, $file) $definition->setClass($service['class']); } + if (isset($service['shared'])) { + $definition->setShared($service['shared']); + } + if (isset($service['scope'])) { - $definition->setScope($service['scope']); + if ('request' !== $id) { + @trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED); + } + $definition->setScope($service['scope'], false); } if (isset($service['synthetic'])) { @@ -189,6 +196,10 @@ private function parseDefinition($id, $service, $file) $definition->setAbstract($service['abstract']); } + if (array_key_exists('deprecated', $service)) { + $definition->setDeprecated(true, $service['deprecated']); + } + if (isset($service['factory'])) { if (is_string($service['factory'])) { if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) { @@ -284,7 +295,30 @@ private function parseDefinition($id, $service, $file) if (isset($service['decorates'])) { $renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null; - $definition->setDecoratedService($service['decorates'], $renameId); + $priority = isset($service['decoration_priority']) ? $service['decoration_priority'] : 0; + $definition->setDecoratedService($service['decorates'], $renameId, $priority); + } + + if (isset($service['autowire'])) { + $definition->setAutowired($service['autowire']); + } + + if (isset($service['autowiring_types'])) { + if (is_string($service['autowiring_types'])) { + $definition->addAutowiringType($service['autowiring_types']); + } else { + if (!is_array($service['autowiring_types'])) { + throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $id, $file)); + } + + foreach ($service['autowiring_types'] as $autowiringType) { + if (!is_string($autowiringType)) { + throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file)); + } + + $definition->addAutowiringType($autowiringType); + } + } } $this->container->setDefinition($id, $definition); diff --git a/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd b/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd index ac2cba7..3241c43 100644 --- a/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd +++ b/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd @@ -81,12 +81,15 @@ + + + @@ -100,6 +103,8 @@ + + diff --git a/vendor/symfony/dependency-injection/Reference.php b/vendor/symfony/dependency-injection/Reference.php index 6a48249..572062b 100644 --- a/vendor/symfony/dependency-injection/Reference.php +++ b/vendor/symfony/dependency-injection/Reference.php @@ -25,6 +25,8 @@ class Reference /** * Constructor. * + * Note: The $strict parameter is deprecated since version 2.8 and will be removed in 3.0. + * * @param string $id The service identifier * @param int $invalidBehavior The behavior when the service does not exist * @param bool $strict Sets how this reference is validated @@ -62,9 +64,15 @@ public function getInvalidBehavior() * Returns true when this Reference is strict. * * @return bool + * + * @deprecated since version 2.8, to be removed in 3.0. */ - public function isStrict() + public function isStrict($triggerDeprecationError = true) { + if ($triggerDeprecationError) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + } + return $this->strict; } } diff --git a/vendor/symfony/dependency-injection/ResettableContainerInterface.php b/vendor/symfony/dependency-injection/ResettableContainerInterface.php new file mode 100644 index 0000000..b74e676 --- /dev/null +++ b/vendor/symfony/dependency-injection/ResettableContainerInterface.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\DependencyInjection; + +/** + * ResettableContainerInterface defines additional resetting functionality + * for containers, allowing to release shared services when the container is + * not needed anymore. + * + * @author Christophe Coevoet + */ +interface ResettableContainerInterface extends ContainerInterface +{ + /** + * Resets shared services from the container. + * + * The container is not intended to be used again after being reset in a normal workflow. This method is + * meant as a way to release references for ref-counting. + * A subsequent call to ContainerInterface::get will recreate a new instance of the shared service. + */ + public function reset(); +} diff --git a/vendor/symfony/dependency-injection/Scope.php b/vendor/symfony/dependency-injection/Scope.php index 737fe26..b0b8ed6 100644 --- a/vendor/symfony/dependency-injection/Scope.php +++ b/vendor/symfony/dependency-injection/Scope.php @@ -15,6 +15,8 @@ * Scope class. * * @author Johannes M. Schmitt + * + * @deprecated since version 2.8, to be removed in 3.0. */ class Scope implements ScopeInterface { diff --git a/vendor/symfony/dependency-injection/ScopeInterface.php b/vendor/symfony/dependency-injection/ScopeInterface.php index ea55165..11b1097 100644 --- a/vendor/symfony/dependency-injection/ScopeInterface.php +++ b/vendor/symfony/dependency-injection/ScopeInterface.php @@ -15,6 +15,8 @@ * Scope Interface. * * @author Johannes M. Schmitt + * + * @deprecated since version 2.8, to be removed in 3.0. */ interface ScopeInterface { diff --git a/vendor/symfony/dependency-injection/composer.json b/vendor/symfony/dependency-injection/composer.json index 87ea6fd..619c9e6 100644 --- a/vendor/symfony/dependency-injection/composer.json +++ b/vendor/symfony/dependency-injection/composer.json @@ -19,9 +19,9 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/yaml": "~2.1", - "symfony/config": "~2.2", - "symfony/expression-language": "~2.6" + "symfony/yaml": "~2.1|~3.0.0", + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0" }, "conflict": { "symfony/expression-language": "<2.6" @@ -32,12 +32,15 @@ "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them" }, "autoload": { - "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" } + "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/dom-crawler/composer.json b/vendor/symfony/dom-crawler/composer.json index f8033c5..5ea57b2 100644 --- a/vendor/symfony/dom-crawler/composer.json +++ b/vendor/symfony/dom-crawler/composer.json @@ -25,7 +25,10 @@ "symfony/css-selector": "" }, "autoload": { - "psr-4": { "Symfony\\Component\\DomCrawler\\": "" } + "psr-4": { "Symfony\\Component\\DomCrawler\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php index b92defe..6a02e9f 100644 --- a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php +++ b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php @@ -132,6 +132,16 @@ public function getListeners($eventName = null) } /** + * {@inheritdoc} + */ + public function getListenerPriority($eventName, $listener) + { + $this->lazyLoad($eventName); + + return parent::getListenerPriority($eventName, $listener); + } + + /** * Adds a service as event subscriber. * * @param string $serviceId The service ID of the subscriber service diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php index 7653ccf..35df816 100644 --- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php +++ b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php @@ -102,6 +102,14 @@ public function getListeners($eventName = null) /** * {@inheritdoc} */ + public function getListenerPriority($eventName, $listener) + { + return $this->dispatcher->getListenerPriority($eventName, $listener); + } + + /** + * {@inheritdoc} + */ public function hasListeners($eventName = null) { return $this->dispatcher->hasListeners($eventName); @@ -186,6 +194,8 @@ public function getNotCalledListeners() } } + uasort($notCalled, array($this, 'sortListenersByPriority')); + return $notCalled; } @@ -285,6 +295,7 @@ private function getListenerInfo($listener, $eventName) { $info = array( 'event' => $eventName, + 'priority' => $this->getListenerPriority($eventName, $listener), ); if ($listener instanceof \Closure) { $info += array( @@ -332,4 +343,25 @@ private function getListenerInfo($listener, $eventName) return $info; } + + private function sortListenersByPriority($a, $b) + { + if (is_int($a['priority']) && !is_int($b['priority'])) { + return 1; + } + + if (!is_int($a['priority']) && is_int($b['priority'])) { + return -1; + } + + if ($a['priority'] === $b['priority']) { + return 0; + } + + if ($a['priority'] > $b['priority']) { + return -1; + } + + return 1; + } } diff --git a/vendor/symfony/event-dispatcher/EventDispatcher.php b/vendor/symfony/event-dispatcher/EventDispatcher.php index b54d07b..65c5cb6 100644 --- a/vendor/symfony/event-dispatcher/EventDispatcher.php +++ b/vendor/symfony/event-dispatcher/EventDispatcher.php @@ -76,6 +76,29 @@ public function getListeners($eventName = null) } /** + * Gets the listener priority for a specific event. + * + * Returns null if the event or the listener does not exist. + * + * @param string $eventName The name of the event + * @param callable $listener The listener + * + * @return int|null The event listener priority + */ + public function getListenerPriority($eventName, $listener) + { + if (!isset($this->listeners[$eventName])) { + return; + } + + foreach ($this->listeners[$eventName] as $priority => $listeners) { + if (false !== ($key = array_search($listener, $listeners, true))) { + return $priority; + } + } + } + + /** * {@inheritdoc} */ public function hasListeners($eventName = null) @@ -169,8 +192,6 @@ protected function doDispatch($listeners, $eventName, Event $event) */ private function sortListeners($eventName) { - $this->sorted[$eventName] = array(); - krsort($this->listeners[$eventName]); $this->sorted[$eventName] = call_user_func_array('array_merge', $this->listeners[$eventName]); } diff --git a/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php b/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php index 7ef9ece..13e8572 100644 --- a/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php +++ b/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php @@ -86,6 +86,14 @@ public function getListeners($eventName = null) /** * {@inheritdoc} */ + public function getListenerPriority($eventName, $listener) + { + return $this->dispatcher->getListenerPriority($eventName, $listener); + } + + /** + * {@inheritdoc} + */ public function hasListeners($eventName = null) { return $this->dispatcher->hasListeners($eventName); diff --git a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php index 2e4c3fd..0169ede 100644 --- a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php +++ b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php @@ -108,6 +108,20 @@ public function testGetAllListenersSortsByPriority() $this->assertSame($expected, $this->dispatcher->getListeners()); } + public function testGetListenerPriority() + { + $listener1 = new TestEventListener(); + $listener2 = new TestEventListener(); + + $this->dispatcher->addListener('pre.foo', $listener1, -10); + $this->dispatcher->addListener('pre.foo', $listener2); + + $this->assertSame(-10, $this->dispatcher->getListenerPriority('pre.foo', $listener1)); + $this->assertSame(0, $this->dispatcher->getListenerPriority('pre.foo', $listener2)); + $this->assertNull($this->dispatcher->getListenerPriority('pre.bar', $listener2)); + $this->assertNull($this->dispatcher->getListenerPriority('pre.foo', function () {})); + } + public function testDispatch() { $this->dispatcher->addListener('pre.foo', array($this->listener, 'preFoo')); diff --git a/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php index 6f2fbcb..18a4b3f 100644 --- a/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php +++ b/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php @@ -92,6 +92,7 @@ public function testPreventDuplicateListenerService() /** * @expectedException \InvalidArgumentException + * @group legacy */ public function testTriggerAListenerServiceOutOfScope() { @@ -111,6 +112,9 @@ public function testTriggerAListenerServiceOutOfScope() $dispatcher->dispatch('onEvent'); } + /** + * @group legacy + */ public function testReEnteringAScope() { $event = new Event(); diff --git a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php index 4aa6226..1d4a8c8 100644 --- a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php +++ b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php @@ -25,7 +25,7 @@ public function testAddRemoveListener() $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch()); - $tdispatcher->addListener('foo', $listener = function () {; }); + $tdispatcher->addListener('foo', $listener = function () {}); $listeners = $dispatcher->getListeners('foo'); $this->assertCount(1, $listeners); $this->assertSame($listener, $listeners[0]); @@ -39,7 +39,7 @@ public function testGetListeners() $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch()); - $tdispatcher->addListener('foo', $listener = function () {; }); + $tdispatcher->addListener('foo', $listener = function () {}); $this->assertSame($dispatcher->getListeners('foo'), $tdispatcher->getListeners('foo')); } @@ -51,7 +51,7 @@ public function testHasListeners() $this->assertFalse($dispatcher->hasListeners('foo')); $this->assertFalse($tdispatcher->hasListeners('foo')); - $tdispatcher->addListener('foo', $listener = function () {; }); + $tdispatcher->addListener('foo', $listener = function () {}); $this->assertTrue($dispatcher->hasListeners('foo')); $this->assertTrue($tdispatcher->hasListeners('foo')); } @@ -76,14 +76,14 @@ public function testGetCalledListeners() { $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch()); - $tdispatcher->addListener('foo', $listener = function () {; }); + $tdispatcher->addListener('foo', $listener = function () {}); $this->assertEquals(array(), $tdispatcher->getCalledListeners()); - $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure')), $tdispatcher->getNotCalledListeners()); + $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 0)), $tdispatcher->getNotCalledListeners()); $tdispatcher->dispatch('foo'); - $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure')), $tdispatcher->getCalledListeners()); + $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => null)), $tdispatcher->getCalledListeners()); $this->assertEquals(array(), $tdispatcher->getNotCalledListeners()); } @@ -107,8 +107,8 @@ public function testLogger() $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger); - $tdispatcher->addListener('foo', $listener1 = function () {; }); - $tdispatcher->addListener('foo', $listener2 = function () {; }); + $tdispatcher->addListener('foo', $listener1 = function () {}); + $tdispatcher->addListener('foo', $listener2 = function () {}); $logger->expects($this->at(0))->method('debug')->with('Notified event "foo" to listener "closure".'); $logger->expects($this->at(1))->method('debug')->with('Notified event "foo" to listener "closure".'); @@ -123,7 +123,7 @@ public function testLoggerWithStoppedEvent() $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger); $tdispatcher->addListener('foo', $listener1 = function (Event $event) { $event->stopPropagation(); }); - $tdispatcher->addListener('foo', $listener2 = function () {; }); + $tdispatcher->addListener('foo', $listener2 = function () {}); $logger->expects($this->at(0))->method('debug')->with('Notified event "foo" to listener "closure".'); $logger->expects($this->at(1))->method('debug')->with('Listener "closure" stopped propagation of the event "foo".'); diff --git a/vendor/symfony/event-dispatcher/composer.json b/vendor/symfony/event-dispatcher/composer.json index 8a6a750..282b770 100644 --- a/vendor/symfony/event-dispatcher/composer.json +++ b/vendor/symfony/event-dispatcher/composer.json @@ -19,10 +19,10 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/config": "~2.0,>=2.0.5", - "symfony/stopwatch": "~2.3", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0", "psr/log": "~1.0" }, "suggest": { @@ -30,12 +30,15 @@ "symfony/http-kernel": "" }, "autoload": { - "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" } + "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/http-foundation/CHANGELOG.md b/vendor/symfony/http-foundation/CHANGELOG.md index dcdeb4e..9f48e82 100644 --- a/vendor/symfony/http-foundation/CHANGELOG.md +++ b/vendor/symfony/http-foundation/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +2.8.0 +----- + + * Finding deep items in `ParameterBag::get()` is deprecated since version 2.8 and + will be removed in 3.0. + 2.6.0 ----- diff --git a/vendor/symfony/http-foundation/JsonResponse.php b/vendor/symfony/http-foundation/JsonResponse.php index 5399d1b..0445a9a 100644 --- a/vendor/symfony/http-foundation/JsonResponse.php +++ b/vendor/symfony/http-foundation/JsonResponse.php @@ -142,7 +142,7 @@ public function setData($data = array()) } if (JSON_ERROR_NONE !== json_last_error()) { - throw new \InvalidArgumentException($this->transformJsonError()); + throw new \InvalidArgumentException(json_last_error_msg()); } $this->data = $data; @@ -196,31 +196,4 @@ protected function update() return $this->setContent($this->data); } - - private function transformJsonError() - { - if (function_exists('json_last_error_msg')) { - return json_last_error_msg(); - } - - switch (json_last_error()) { - case JSON_ERROR_DEPTH: - return 'Maximum stack depth exceeded.'; - - case JSON_ERROR_STATE_MISMATCH: - return 'Underflow or the modes mismatch.'; - - case JSON_ERROR_CTRL_CHAR: - return 'Unexpected control character found.'; - - case JSON_ERROR_SYNTAX: - return 'Syntax error, malformed JSON.'; - - case JSON_ERROR_UTF8: - return 'Malformed UTF-8 characters, possibly incorrectly encoded.'; - - default: - return 'Unknown error.'; - } - } } diff --git a/vendor/symfony/http-foundation/ParameterBag.php b/vendor/symfony/http-foundation/ParameterBag.php index ecc0de1..4560322 100644 --- a/vendor/symfony/http-foundation/ParameterBag.php +++ b/vendor/symfony/http-foundation/ParameterBag.php @@ -78,7 +78,9 @@ public function add(array $parameters = array()) /** * Returns a parameter by name. * - * @param string $path The key + * Note: Finding deep items is deprecated since version 2.8, to be removed in 3.0. + * + * @param string $key The 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 * @@ -86,21 +88,25 @@ public function add(array $parameters = array()) * * @throws \InvalidArgumentException */ - public function get($path, $default = null, $deep = false) + public function get($key, $default = null, $deep = false) { - if (!$deep || false === $pos = strpos($path, '[')) { - return array_key_exists($path, $this->parameters) ? $this->parameters[$path] : $default; + if ($deep) { + @trigger_error('Using paths to find deeper items in '.__METHOD__.' is deprecated since version 2.8 and will be removed in 3.0. Filter the returned value in your own code instead.', E_USER_DEPRECATED); + } + + if (!$deep || false === $pos = strpos($key, '[')) { + return array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default; } - $root = substr($path, 0, $pos); + $root = substr($key, 0, $pos); if (!array_key_exists($root, $this->parameters)) { return $default; } $value = $this->parameters[$root]; $currentKey = null; - for ($i = $pos, $c = strlen($path); $i < $c; ++$i) { - $char = $path[$i]; + for ($i = $pos, $c = strlen($key); $i < $c; ++$i) { + $char = $key[$i]; if ('[' === $char) { if (null !== $currentKey) { @@ -172,7 +178,7 @@ public function remove($key) * Returns the alphabetic characters of the parameter value. * * @param string $key The parameter key - * @param mixed $default The default value if the parameter key does not exist + * @param string $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 string The filtered value @@ -186,7 +192,7 @@ public function getAlpha($key, $default = '', $deep = false) * Returns the alphabetic characters and digits of the parameter value. * * @param string $key The parameter key - * @param mixed $default The default value if the parameter key does not exist + * @param string $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 string The filtered value @@ -200,7 +206,7 @@ public function getAlnum($key, $default = '', $deep = false) * Returns the digits of the parameter value. * * @param string $key The parameter key - * @param mixed $default The default value if the parameter key does not exist + * @param string $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 string The filtered value @@ -208,14 +214,14 @@ public function getAlnum($key, $default = '', $deep = false) public function getDigits($key, $default = '', $deep = false) { // we need to remove - and + because they're allowed in the filter - return str_replace(array('-', '+'), '', $this->filter($key, $default, $deep, FILTER_SANITIZE_NUMBER_INT)); + return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT, array(), $deep)); } /** * Returns the parameter value converted to integer. * * @param string $key The parameter key - * @param mixed $default The default value if the parameter key does not exist + * @param int $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 int The filtered value @@ -236,7 +242,7 @@ public function getInt($key, $default = 0, $deep = false) */ public function getBoolean($key, $default = false, $deep = false) { - return $this->filter($key, $default, $deep, FILTER_VALIDATE_BOOLEAN); + return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN, array(), $deep); } /** @@ -244,16 +250,31 @@ public function getBoolean($key, $default = false, $deep = false) * * @param string $key Key. * @param mixed $default Default = null. - * @param bool $deep Default = false. * @param int $filter FILTER_* constant. * @param mixed $options Filter options. + * @param bool $deep Default = false. * * @see http://php.net/manual/en/function.filter-var.php * * @return mixed */ - public function filter($key, $default = null, $deep = false, $filter = FILTER_DEFAULT, $options = array()) + public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array(), $deep = false) { + static $filters = null; + + if (null === $filters) { + foreach (filter_list() as $tmp) { + $filters[filter_id($tmp)] = 1; + } + } + if (is_bool($filter) || !isset($filters[$filter]) || is_array($deep)) { + @trigger_error('Passing the $deep boolean as 3rd argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Remove it altogether as the $deep argument will be removed in 3.0.', E_USER_ERROR); + $tmp = $deep; + $deep = $filter; + $filter = $options; + $options = $tmp; + } + $value = $this->get($key, $default, $deep); // Always turn $options into an array - this allows filter_var option shortcuts. diff --git a/vendor/symfony/http-foundation/README.md b/vendor/symfony/http-foundation/README.md index 11ad6ee..a7dba39 100644 --- a/vendor/symfony/http-foundation/README.md +++ b/vendor/symfony/http-foundation/README.md @@ -34,18 +34,6 @@ $response->send(); The Request and the Response classes have many other methods that implement the HTTP specification. -Loading -------- - -If you are not using Composer but are using PHP 5.3.x, you must add the following to your autoloader: - -```php -// SessionHandlerInterface -if (!interface_exists('SessionHandlerInterface')) { - $loader->registerPrefixFallback(__DIR__.'/../vendor/symfony/src/Symfony/Component/HttpFoundation/Resources/stubs'); -} -``` - Resources --------- diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php index ff8d411..de36953 100644 --- a/vendor/symfony/http-foundation/Request.php +++ b/vendor/symfony/http-foundation/Request.php @@ -714,6 +714,8 @@ public static function getHttpMethodParameterOverride() * It is better to explicitly get request parameters from the appropriate * public property instead (query, attributes, request). * + * Note: Finding deep items is deprecated since version 2.8, to be removed in 3.0. + * * @param string $key the key * @param mixed $default the default value * @param bool $deep is parameter deep in multidimensional array @@ -722,6 +724,10 @@ public static function getHttpMethodParameterOverride() */ public function get($key, $default = null, $deep = false) { + if ($deep) { + @trigger_error('Using paths to find deeper items in '.__METHOD__.' is deprecated since version 2.8 and will be removed in 3.0. Filter the returned value in your own code instead.', E_USER_DEPRECATED); + } + if ($this !== $result = $this->query->get($key, $this, $deep)) { return $result; } diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php index cb706d5..c88fb6c 100644 --- a/vendor/symfony/http-foundation/Response.php +++ b/vendor/symfony/http-foundation/Response.php @@ -114,7 +114,7 @@ class Response * * The list of codes is complete according to the * {@link http://www.iana.org/assignments/http-status-codes/ Hypertext Transfer Protocol (HTTP) Status Code Registry} - * (last updated 2012-02-13). + * (last updated 2015-05-19). * * Unless otherwise noted, the status code is defined in RFC2616. * @@ -140,7 +140,6 @@ class Response 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', - 306 => 'Reserved', 307 => 'Temporary Redirect', 308 => 'Permanent Redirect', // RFC7238 400 => 'Bad Request', @@ -156,10 +155,10 @@ class Response 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', - 413 => 'Request Entity Too Large', - 414 => 'Request-URI Too Long', + 413 => 'Payload Too Large', + 414 => 'URI Too Long', 415 => 'Unsupported Media Type', - 416 => 'Requested Range Not Satisfiable', + 416 => 'Range Not Satisfiable', 417 => 'Expectation Failed', 418 => 'I\'m a teapot', // RFC2324 422 => 'Unprocessable Entity', // RFC4918 @@ -198,9 +197,6 @@ public function __construct($content = '', $status = 200, $headers = array()) $this->setContent($content); $this->setStatusCode($status); $this->setProtocolVersion('1.0'); - if (!$this->headers->has('Date')) { - $this->setDate(\DateTime::createFromFormat('U', time(), new \DateTimeZone('UTC'))); - } } /** @@ -329,8 +325,9 @@ public function sendHeaders() return $this; } - // status - header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode); + if (!$this->headers->has('Date')) { + $this->setDate(\DateTime::createFromFormat('U', time())); + } // headers foreach ($this->headers->allPreserveCase() as $name => $values) { @@ -339,6 +336,9 @@ public function sendHeaders() } } + // status + header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode); + // cookies foreach ($this->headers->getCookies() as $cookie) { setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly()); @@ -455,7 +455,7 @@ public function setStatusCode($code, $text = null) } if (null === $text) { - $this->statusText = isset(self::$statusTexts[$code]) ? self::$statusTexts[$code] : ''; + $this->statusText = isset(self::$statusTexts[$code]) ? self::$statusTexts[$code] : 'unknown status'; return $this; } @@ -608,7 +608,11 @@ public function mustRevalidate() */ public function getDate() { - return $this->headers->getDate('Date', new \DateTime()); + if (!$this->headers->has('Date')) { + $this->setDate(\DateTime::createFromFormat('U', time())); + } + + return $this->headers->getDate('Date'); } /** diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php index fd03dc8..52e9900 100644 --- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php +++ b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php @@ -101,11 +101,7 @@ public function __construct(array $options = array(), $handler = null, MetadataB session_cache_limiter(''); // disable by default because it's managed by HeaderBag (if used) ini_set('session.use_cookies', 1); - if (PHP_VERSION_ID >= 50400) { - session_register_shutdown(); - } else { - register_shutdown_function('session_write_close'); - } + session_register_shutdown(); $this->setMetadataBag($metaBag); $this->setOptions($options); diff --git a/vendor/symfony/http-foundation/composer.json b/vendor/symfony/http-foundation/composer.json index 09f9679..55edbbf 100644 --- a/vendor/symfony/http-foundation/composer.json +++ b/vendor/symfony/http-foundation/composer.json @@ -16,19 +16,22 @@ } ], "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-php54": "~1.0" }, "require-dev": { - "symfony/expression-language": "~2.4" + "symfony/expression-language": "~2.4|~3.0.0" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, - "classmap": [ "Resources/stubs" ] + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/http-kernel/Bundle/Bundle.php b/vendor/symfony/http-kernel/Bundle/Bundle.php index ebec7ff..5dfc6ce 100644 --- a/vendor/symfony/http-kernel/Bundle/Bundle.php +++ b/vendor/symfony/http-kernel/Bundle/Bundle.php @@ -11,7 +11,7 @@ namespace Symfony\Component\HttpKernel\Bundle; -use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\Console\Application; @@ -24,8 +24,12 @@ * * @author Fabien Potencier */ -abstract class Bundle extends ContainerAware implements BundleInterface +abstract class Bundle implements BundleInterface { + /** + * @var ContainerInterface + */ + protected $container; protected $name; protected $extension; protected $path; @@ -59,6 +63,16 @@ public function build(ContainerBuilder $container) } /** + * Sets the container. + * + * @param ContainerInterface|null $container A ContainerInterface instance or null + */ + public function setContainer(ContainerInterface $container = null) + { + $this->container = $container; + } + + /** * Returns the bundle's container extension. * * @return ExtensionInterface|null The container extension @@ -68,17 +82,17 @@ public function build(ContainerBuilder $container) public function getContainerExtension() { if (null === $this->extension) { - $class = $this->getContainerExtensionClass(); - if (class_exists($class)) { - $extension = new $class(); + $extension = $this->createContainerExtension(); + if (null !== $extension) { if (!$extension instanceof ExtensionInterface) { - throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', $class)); + throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension))); } // check naming convention $basename = preg_replace('/Bundle$/', '', $this->getName()); $expectedAlias = Container::underscore($basename); + if ($expectedAlias != $extension->getAlias()) { throw new \LogicException(sprintf( '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.', @@ -200,4 +214,16 @@ protected function getContainerExtensionClass() return $this->getNamespace().'\\DependencyInjection\\'.$basename.'Extension'; } + + /** + * Creates the bundle's container extension. + * + * @return ExtensionInterface|null + */ + protected function createContainerExtension() + { + if (class_exists($class = $this->getContainerExtensionClass())) { + return new $class(); + } + } } diff --git a/vendor/symfony/http-kernel/CHANGELOG.md b/vendor/symfony/http-kernel/CHANGELOG.md index ad27886..bab3aba 100644 --- a/vendor/symfony/http-kernel/CHANGELOG.md +++ b/vendor/symfony/http-kernel/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.8.0 +----- + + * deprecated `Profiler::import` and `Profiler::export` + 2.7.0 ----- diff --git a/vendor/symfony/http-kernel/Config/EnvParametersResource.php b/vendor/symfony/http-kernel/Config/EnvParametersResource.php index 5f54450..b4178a5 100644 --- a/vendor/symfony/http-kernel/Config/EnvParametersResource.php +++ b/vendor/symfony/http-kernel/Config/EnvParametersResource.php @@ -11,14 +11,14 @@ namespace Symfony\Component\HttpKernel\Config; -use Symfony\Component\Config\Resource\ResourceInterface; +use Symfony\Component\Config\Resource\SelfCheckingResourceInterface; /** * EnvParametersResource represents resources stored in prefixed environment variables. * * @author Chris Wilkinson */ -class EnvParametersResource implements ResourceInterface, \Serializable +class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable { /** * @var string diff --git a/vendor/symfony/http-kernel/DataCollector/AjaxDataCollector.php b/vendor/symfony/http-kernel/DataCollector/AjaxDataCollector.php new file mode 100644 index 0000000..b8405d5 --- /dev/null +++ b/vendor/symfony/http-kernel/DataCollector/AjaxDataCollector.php @@ -0,0 +1,33 @@ + + * + * 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; + +/** + * AjaxDataCollector. + * + * @author Bart van den Burg + */ +class AjaxDataCollector extends DataCollector +{ + public function collect(Request $request, Response $response, \Exception $exception = null) + { + // all collecting is done client side + } + + public function getName() + { + return 'ajax'; + } +} diff --git a/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php b/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php index 4efe7cb..50dde02 100644 --- a/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php +++ b/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php @@ -25,11 +25,30 @@ class LazyLoadingFragmentHandler extends FragmentHandler private $container; private $rendererIds = array(); - public function __construct(ContainerInterface $container, $debug = false, RequestStack $requestStack = null) + /** + * Constructor. + * + * RequestStack will become required in 3.0. + * + * @param ContainerInterface $container A container + * @param RequestStack $requestStack The Request stack that controls the lifecycle of requests + * @param bool $debug Whether the debug mode is enabled or not + */ + public function __construct(ContainerInterface $container, $requestStack = null, $debug = false) { $this->container = $container; - parent::__construct(array(), $debug, $requestStack); + if ((null !== $requestStack && !$requestStack instanceof RequestStack) || $debug instanceof RequestStack) { + $tmp = $debug; + $debug = $requestStack; + $requestStack = func_num_args() < 3 ? null : $tmp; + + @trigger_error('The '.__METHOD__.' method now requires a RequestStack to be given as second argument as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } elseif (!$requestStack instanceof RequestStack) { + @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } + + parent::__construct($requestStack, array(), $debug); } /** diff --git a/vendor/symfony/http-kernel/Event/PostResponseEvent.php b/vendor/symfony/http-kernel/Event/PostResponseEvent.php index 5d4450b..2406fdd 100644 --- a/vendor/symfony/http-kernel/Event/PostResponseEvent.php +++ b/vendor/symfony/http-kernel/Event/PostResponseEvent.php @@ -12,53 +12,26 @@ namespace Symfony\Component\HttpKernel\Event; use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\EventDispatcher\Event; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; /** * Allows to execute logic after a response was sent. * + * Since it's only triggered on master requests, the `getRequestType()` method + * will always return the value of `HttpKernelInterface::MASTER_REQUEST`. + * * @author Jordi Boggiano */ -class PostResponseEvent extends Event +class PostResponseEvent extends KernelEvent { - /** - * The kernel in which this event was thrown. - * - * @var HttpKernelInterface - */ - private $kernel; - - private $request; - private $response; public function __construct(HttpKernelInterface $kernel, Request $request, Response $response) { - $this->kernel = $kernel; - $this->request = $request; - $this->response = $response; - } + parent::__construct($kernel, $request, HttpKernelInterface::MASTER_REQUEST); - /** - * Returns the kernel in which this event was thrown. - * - * @return HttpKernelInterface - */ - public function getKernel() - { - return $this->kernel; - } - - /** - * Returns the request for which this event was thrown. - * - * @return Request - */ - public function getRequest() - { - return $this->request; + $this->response = $response; } /** diff --git a/vendor/symfony/http-kernel/EventListener/LocaleListener.php b/vendor/symfony/http-kernel/EventListener/LocaleListener.php index 564f6dc..0ff3a86 100644 --- a/vendor/symfony/http-kernel/EventListener/LocaleListener.php +++ b/vendor/symfony/http-kernel/EventListener/LocaleListener.php @@ -36,10 +36,36 @@ class LocaleListener implements EventSubscriberInterface private $requestStack; /** + * Constructor. + * * RequestStack will become required in 3.0. + * + * @param RequestStack $requestStack A RequestStack instance + * @param string $defaultLocale The default locale + * @param RequestContextAwareInterface|null $router The router + * + * @throws \InvalidArgumentException */ - public function __construct($defaultLocale = 'en', RequestContextAwareInterface $router = null, RequestStack $requestStack = null) + public function __construct($requestStack = null, $defaultLocale = 'en', $router = null) { + if ((null !== $requestStack && !$requestStack instanceof RequestStack) || $defaultLocale instanceof RequestContextAwareInterface || $router instanceof RequestStack) { + $tmp = $router; + $router = func_num_args() < 2 ? null : $defaultLocale; + $defaultLocale = $requestStack; + $requestStack = func_num_args() < 3 ? null : $tmp; + + @trigger_error('The '.__METHOD__.' method now requires a RequestStack to be given as first argument as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } elseif (!$requestStack instanceof RequestStack) { + @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } + + if (null !== $requestStack && !$requestStack instanceof RequestStack) { + throw new \InvalidArgumentException('RequestStack instance expected.'); + } + if (null !== $router && !$router instanceof RequestContextAwareInterface) { + throw new \InvalidArgumentException('Router must implement RequestContextAwareInterface.'); + } + $this->defaultLocale = $defaultLocale; $this->requestStack = $requestStack; $this->router = $router; diff --git a/vendor/symfony/http-kernel/EventListener/ProfilerListener.php b/vendor/symfony/http-kernel/EventListener/ProfilerListener.php index 06a5bbf..f73f325 100644 --- a/vendor/symfony/http-kernel/EventListener/ProfilerListener.php +++ b/vendor/symfony/http-kernel/EventListener/ProfilerListener.php @@ -42,18 +42,30 @@ class ProfilerListener implements EventSubscriberInterface * Constructor. * * @param Profiler $profiler A Profiler instance + * @param RequestStack $requestStack A RequestStack instance * @param RequestMatcherInterface|null $matcher A RequestMatcher instance * @param bool $onlyException true if the profiler only collects data when an exception occurs, false otherwise * @param bool $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise - * @param RequestStack|null $requestStack A RequestStack instance */ - public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false, RequestStack $requestStack = null) + public function __construct(Profiler $profiler, $requestStack = null, $matcher = null, $onlyException = false, $onlyMasterRequests = false) { - if (null === $requestStack) { - // Prevent the deprecation notice to be triggered all the time. - // The onKernelRequest() method fires some logic only when the - // RequestStack instance is not provided as a dependency. - @trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED); + if ($requestStack instanceof RequestMatcherInterface || (null !== $matcher && !$matcher instanceof RequestMatcherInterface) || $onlyMasterRequests instanceof RequestStack) { + $tmp = $onlyMasterRequests; + $onlyMasterRequests = $onlyException; + $onlyException = $matcher; + $matcher = $requestStack; + $requestStack = func_num_args() < 5 ? null : $tmp; + + @trigger_error('The '.__METHOD__.' method now requires a RequestStack to be given as second argument as '.__CLASS__.'::onKernelRequest method will be removed in 3.0.', E_USER_DEPRECATED); + } elseif (!$requestStack instanceof RequestStack) { + @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::onKernelRequest method will be removed in 3.0.', E_USER_DEPRECATED); + } + + if (null !== $requestStack && !$requestStack instanceof RequestStack) { + throw new \InvalidArgumentException('RequestStack instance expected.'); + } + if (null !== $matcher && !$matcher instanceof RequestMatcherInterface) { + throw new \InvalidArgumentException('Matcher must implement RequestMatcherInterface.'); } $this->profiler = $profiler; diff --git a/vendor/symfony/http-kernel/EventListener/RouterListener.php b/vendor/symfony/http-kernel/EventListener/RouterListener.php index 297aab6..761e591 100644 --- a/vendor/symfony/http-kernel/EventListener/RouterListener.php +++ b/vendor/symfony/http-kernel/EventListener/RouterListener.php @@ -51,14 +51,35 @@ class RouterListener implements EventSubscriberInterface * RequestStack will become required in 3.0. * * @param UrlMatcherInterface|RequestMatcherInterface $matcher The Url or Request matcher + * @param RequestStack $requestStack A RequestStack instance * @param RequestContext|null $context The RequestContext (can be null when $matcher implements RequestContextAwareInterface) * @param LoggerInterface|null $logger The logger - * @param RequestStack|null $requestStack A RequestStack instance * * @throws \InvalidArgumentException */ - public function __construct($matcher, RequestContext $context = null, LoggerInterface $logger = null, RequestStack $requestStack = null) + public function __construct($matcher, $requestStack = null, $context = null, $logger = null) { + if ($requestStack instanceof RequestContext || $context instanceof LoggerInterface || $logger instanceof RequestStack) { + $tmp = $requestStack; + $requestStack = $logger; + $logger = $context; + $context = $tmp; + + @trigger_error('The '.__METHOD__.' method now requires a RequestStack to be given as second argument as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } elseif (!$requestStack instanceof RequestStack) { + @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } + + if (null !== $requestStack && !$requestStack instanceof RequestStack) { + throw new \InvalidArgumentException('RequestStack instance expected.'); + } + if (null !== $context && !$context instanceof RequestContext) { + throw new \InvalidArgumentException('RequestContext instance expected.'); + } + if (null !== $logger && !$logger instanceof LoggerInterface) { + throw new \InvalidArgumentException('Logger must implement LoggerInterface.'); + } + if (!$matcher instanceof UrlMatcherInterface && !$matcher instanceof RequestMatcherInterface) { throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.'); } @@ -67,10 +88,6 @@ public function __construct($matcher, RequestContext $context = null, LoggerInte throw new \InvalidArgumentException('You must either pass a RequestContext or the matcher must implement RequestContextAwareInterface.'); } - if (!$requestStack instanceof RequestStack) { - @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); - } - $this->matcher = $matcher; $this->context = $context ?: $matcher->getContext(); $this->requestStack = $requestStack; diff --git a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php index 774870a..dff3773 100644 --- a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php +++ b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php @@ -44,12 +44,30 @@ class FragmentHandler * * RequestStack will become required in 3.0. * + * @param RequestStack $requestStack The Request stack that controls the lifecycle of requests * @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances * @param bool $debug Whether the debug mode is enabled or not - * @param RequestStack|null $requestStack The Request stack that controls the lifecycle of requests */ - public function __construct(array $renderers = array(), $debug = false, RequestStack $requestStack = null) + public function __construct($requestStack = null, $renderers = array(), $debug = false) { + if (is_array($requestStack)) { + $tmp = $debug; + $debug = func_num_args() < 2 ? false : $renderers; + $renderers = $requestStack; + $requestStack = func_num_args() < 3 ? null : $tmp; + + @trigger_error('The '.__METHOD__.' method now requires a RequestStack to be given as first argument as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } elseif (!$requestStack instanceof RequestStack) { + @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED); + } + + if (null !== $requestStack && !$requestStack instanceof RequestStack) { + throw new \InvalidArgumentException('RequestStack instance expected.'); + } + if (!is_array($renderers)) { + throw new \InvalidArgumentException('Renderers must be an array.'); + } + $this->requestStack = $requestStack; foreach ($renderers as $renderer) { $this->addRenderer($renderer); diff --git a/vendor/symfony/http-kernel/HttpCache/Store.php b/vendor/symfony/http-kernel/HttpCache/Store.php index 044d14e..463caa0 100644 --- a/vendor/symfony/http-kernel/HttpCache/Store.php +++ b/vendor/symfony/http-kernel/HttpCache/Store.php @@ -32,12 +32,16 @@ class Store implements StoreInterface * Constructor. * * @param string $root The path to the cache directory + * + * @throws \RuntimeException */ public function __construct($root) { $this->root = $root; if (!is_dir($this->root)) { - mkdir($this->root, 0777, true); + if (false === @mkdir($this->root, 0777, true) && !is_dir($this->root)) { + throw new \RuntimeException(sprintf('Unable to create the store directory (%s).', $this->root)); + } } $this->keyCache = new \SplObjectStorage(); $this->locks = array(); @@ -74,7 +78,7 @@ public function cleanup() public function lock(Request $request) { $path = $this->getPath($this->getCacheKey($request).'.lck'); - if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true)) { + if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true) && !is_dir(dirname($path))) { return false; } @@ -106,7 +110,10 @@ public function unlock(Request $request) public function isLocked(Request $request) { - return is_file($this->getPath($this->getCacheKey($request).'.lck')); + $path = $this->getPath($this->getCacheKey($request).'.lck'); + clearstatcache(true, $path); + + return is_file($path); } /** @@ -338,7 +345,7 @@ private function load($key) private function save($key, $data) { $path = $this->getPath($key); - if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true)) { + if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true) && !is_dir(dirname($path))) { return false; } diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php index a02dcd9..c53d4f4 100644 --- a/vendor/symfony/http-kernel/Kernel.php +++ b/vendor/symfony/http-kernel/Kernel.php @@ -21,6 +21,7 @@ use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\Loader\IniFileLoader; use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; +use Symfony\Component\DependencyInjection\Loader\DirectoryLoader; use Symfony\Component\DependencyInjection\Loader\ClosureLoader; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -58,11 +59,11 @@ protected $startTime; protected $loadClassCache; - const VERSION = '2.7.6'; - const VERSION_ID = 20706; + const VERSION = '2.8.0'; + const VERSION_ID = 20800; const MAJOR_VERSION = 2; - const MINOR_VERSION = 7; - const RELEASE_VERSION = 6; + const MINOR_VERSION = 8; + const RELEASE_VERSION = 0; const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '05/2018'; @@ -685,6 +686,7 @@ protected function getContainerLoader(ContainerInterface $container) new YamlFileLoader($container, $locator), new IniFileLoader($container, $locator), new PhpFileLoader($container, $locator), + new DirectoryLoader($container, $locator), new ClosureLoader($container), )); diff --git a/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php index c6395bd..3eb6919 100644 --- a/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php @@ -11,10 +11,15 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\BaseMemcacheProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * Base Memcache storage for profiling information in a Memcache. * * @author Andrej Hudec + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ abstract class BaseMemcacheProfilerStorage implements ProfilerStorageInterface { diff --git a/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php index 581ab64..29da4ab 100644 --- a/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php @@ -41,8 +41,8 @@ public function __construct($dsn) } $this->folder = substr($dsn, 5); - if (!is_dir($this->folder)) { - mkdir($this->folder, 0777, true); + if (!is_dir($this->folder) && false === @mkdir($this->folder, 0777, true) && !is_dir($this->folder)) { + throw new \RuntimeException(sprintf('Unable to create the storage directory (%s).', $this->folder)); } } @@ -128,6 +128,8 @@ public function read($token) /** * {@inheritdoc} + * + * @throws \RuntimeException */ public function write(Profile $profile) { @@ -137,8 +139,8 @@ public function write(Profile $profile) if (!$profileIndexed) { // Create directory $dir = dirname($file); - if (!is_dir($dir)) { - mkdir($dir, 0777, true); + if (!is_dir($dir) && false === @mkdir($dir, 0777, true) && !is_dir($dir)) { + throw new \RuntimeException(sprintf('Unable to create the storage directory (%s).', $dir)); } } diff --git a/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php index 2727405..997c0dd 100644 --- a/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php @@ -11,10 +11,15 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\MemcacheProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * Memcache Profiler Storage. * * @author Andrej Hudec + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage { diff --git a/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php index 0c57373..edf6ff1 100644 --- a/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php @@ -11,10 +11,15 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\MemcachedProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * Memcached Profiler Storage. * * @author Andrej Hudec + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage { diff --git a/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php index f35a7f7..fddc87e 100644 --- a/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php @@ -11,6 +11,12 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\MongoDbProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + +/** + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. + */ class MongoDbProfilerStorage implements ProfilerStorageInterface { protected $dsn; diff --git a/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php index 92e8a1b..45d9cff 100644 --- a/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php @@ -11,10 +11,15 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\MysqlProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * A ProfilerStorage for Mysql. * * @author Jan Schumann + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ class MysqlProfilerStorage extends PdoProfilerStorage { diff --git a/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php index 48f813f..4294c09 100644 --- a/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php @@ -11,11 +11,16 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\PdoProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * Base PDO storage for profiling information in a PDO database. * * @author Fabien Potencier * @author Jan Schumann + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ abstract class PdoProfilerStorage implements ProfilerStorageInterface { diff --git a/vendor/symfony/http-kernel/Profiler/Profiler.php b/vendor/symfony/http-kernel/Profiler/Profiler.php index 864f624..378bf5d 100644 --- a/vendor/symfony/http-kernel/Profiler/Profiler.php +++ b/vendor/symfony/http-kernel/Profiler/Profiler.php @@ -137,9 +137,13 @@ public function purge() * @param Profile $profile A Profile instance * * @return string The exported data + * + * @deprecated since Symfony 2.8, to be removed in 3.0. */ public function export(Profile $profile) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + return base64_encode(serialize($profile)); } @@ -149,9 +153,13 @@ public function export(Profile $profile) * @param string $data A data string as exported by the export() method * * @return Profile A Profile instance + * + * @deprecated since Symfony 2.8, to be removed in 3.0. */ public function import($data) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + $profile = unserialize(base64_decode($data)); if ($this->storage->read($profile->getToken())) { diff --git a/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php index b0e14ea..2568e3b 100644 --- a/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php @@ -11,11 +11,16 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\RedisProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * RedisProfilerStorage stores profiling information in Redis. * * @author Andrej Hudec * @author Stephane PY + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ class RedisProfilerStorage implements ProfilerStorageInterface { diff --git a/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php index 4a996fd..2f78864 100644 --- a/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php +++ b/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php @@ -11,10 +11,15 @@ namespace Symfony\Component\HttpKernel\Profiler; +@trigger_error('The '.__NAMESPACE__.'\SqliteProfilerStorage class is deprecated since Symfony 2.8 and will be removed in 3.0. Use FileProfilerStorage instead.', E_USER_DEPRECATED); + /** * SqliteProfilerStorage stores profiling information in a SQLite database. * * @author Fabien Potencier + * + * @deprecated Deprecated since Symfony 2.8, to be removed in Symfony 3.0. + * Use {@link FileProfilerStorage} instead. */ class SqliteProfilerStorage extends PdoProfilerStorage { diff --git a/vendor/symfony/http-kernel/composer.json b/vendor/symfony/http-kernel/composer.json index 623d732..d0e92d5 100644 --- a/vendor/symfony/http-kernel/composer.json +++ b/vendor/symfony/http-kernel/composer.json @@ -17,27 +17,27 @@ ], "require": { "php": ">=5.3.9", - "symfony/event-dispatcher": "~2.6,>=2.6.7", - "symfony/http-foundation": "~2.5,>=2.5.4", + "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", + "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0", "symfony/debug": "~2.6,>=2.6.2", "psr/log": "~1.0" }, "require-dev": { - "symfony/browser-kit": "~2.3", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.7", - "symfony/console": "~2.3", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.2", - "symfony/dom-crawler": "~2.0,>=2.0.5", - "symfony/expression-language": "~2.4", - "symfony/finder": "~2.0,>=2.0.5", - "symfony/process": "~2.0,>=2.0.5", - "symfony/routing": "~2.2", - "symfony/stopwatch": "~2.3", - "symfony/templating": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/var-dumper": "~2.6" + "symfony/browser-kit": "~2.3|~3.0.0", + "symfony/class-loader": "~2.1|~3.0.0", + "symfony/config": "~2.8", + "symfony/console": "~2.3|~3.0.0", + "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.8|~3.0.0", + "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/finder": "~2.0,>=2.0.5|~3.0.0", + "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/routing": "~2.8|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0", + "symfony/templating": "~2.2|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/var-dumper": "~2.6|~3.0.0" }, "conflict": { "symfony/config": "<2.7" @@ -52,12 +52,15 @@ "symfony/var-dumper": "" }, "autoload": { - "psr-4": { "Symfony\\Component\\HttpKernel\\": "" } + "psr-4": { "Symfony\\Component\\HttpKernel\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/http-kernel/phpunit.xml.dist b/vendor/symfony/http-kernel/phpunit.xml.dist index 1314966..17c4893 100644 --- a/vendor/symfony/http-kernel/phpunit.xml.dist +++ b/vendor/symfony/http-kernel/phpunit.xml.dist @@ -25,4 +25,14 @@ + + + + + + Symfony\Component\HttpFoundation + + + + diff --git a/vendor/symfony/polyfill-mbstring/LICENSE b/vendor/symfony/polyfill-mbstring/LICENSE new file mode 100644 index 0000000..ef1cde9 --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2014-2015 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/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php new file mode 100644 index 0000000..31f678b --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -0,0 +1,604 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Mbstring; + +/** + * Partial mbstring implementation in PHP, iconv based, UTF-8 centric. + * + * Implemented: + * - mb_convert_encoding - Convert character encoding + * - mb_convert_variables - Convert character code in variable(s) + * - mb_decode_mimeheader - Decode string in MIME header field + * - mb_encode_mimeheader - Encode string for MIME header XXX NATIVE IMPLEMENTATION IS REALLY BUGGED + * - mb_convert_case - Perform case folding on a string + * - mb_get_info - Get internal settings of mbstring + * - mb_http_input - Detect HTTP input character encoding + * - mb_http_output - Set/Get HTTP output character encoding + * - mb_internal_encoding - Set/Get internal character encoding + * - mb_list_encodings - Returns an array of all supported encodings + * - mb_output_handler - Callback function converts character encoding in output buffer + * - mb_strlen - Get string length + * - mb_strpos - Find position of first occurrence of string in a string + * - mb_strrpos - Find position of last occurrence of a string in a string + * - mb_strtolower - Make a string lowercase + * - mb_strtoupper - Make a string uppercase + * - mb_substitute_character - Set/Get substitution character + * - mb_substr - Get part of string + * - mb_stripos - Finds position of first occurrence of a string within another, case insensitive + * - mb_stristr - Finds first occurrence of a string within another, case insensitive + * - mb_strrchr - Finds the last occurrence of a character in a string within another + * - mb_strrichr - Finds the last occurrence of a character in a string within another, case insensitive + * - mb_strripos - Finds position of last occurrence of a string within another, case insensitive + * - mb_strstr - Finds first occurrence of a string within anothers + * - mb_strwidth - Return width of string + * - mb_substr_count - Count the number of substring occurrences + * + * Not implemented: + * - mb_convert_kana - Convert "kana" one from another ("zen-kaku", "han-kaku" and more) + * - mb_decode_numericentity - Decode HTML numeric string reference to character + * - mb_encode_numericentity - Encode character to HTML numeric string reference + * - mb_ereg_* - Regular expression with multibyte support + * - mb_parse_str - Parse GET/POST/COOKIE data and set global variable + * - mb_preferred_mime_name - Get MIME charset string + * - mb_regex_encoding - Returns current encoding for multibyte regex as string + * - mb_regex_set_options - Set/Get the default options for mbregex functions + * - mb_send_mail - Send encoded mail + * - mb_split - Split multibyte string using regular expression + * - mb_strcut - Get part of string + * - mb_strimwidth - Get truncated string with specified width + * + * @author Nicolas Grekas + * + * @internal + */ +final class Mbstring +{ + const MB_CASE_FOLD = PHP_INT_MAX; + + private static $encodingList = array('ASCII', 'UTF-8'); + private static $language = 'neutral'; + private static $internalEncoding = 'UTF-8'; + private static $caseFold = array( + array('µ','ſ',"\xCD\x85",'ς',"\xCF\x90","\xCF\x91","\xCF\x95","\xCF\x96","\xCF\xB0","\xCF\xB1","\xCF\xB5","\xE1\xBA\x9B","\xE1\xBE\xBE"), + array('μ','s','ι', 'σ','β', 'θ', 'φ', 'π', 'κ', 'ρ', 'ε', "\xE1\xB9\xA1",'ι'), + ); + + public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null) + { + if (is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) { + $fromEncoding = self::mb_detect_encoding($s, $fromEncoding); + } else { + $fromEncoding = self::getEncoding($fromEncoding); + } + + $toEncoding = self::getEncoding($toEncoding); + + if ('BASE64' === $fromEncoding) { + $s = base64_decode($s); + $fromEncoding = $toEncoding; + } + + if ('BASE64' === $toEncoding) { + return base64_encode($s); + } + + if ('HTML-ENTITIES' === $toEncoding || 'HTML' === $toEncoding) { + if ('HTML-ENTITIES' === $fromEncoding || 'HTML' === $fromEncoding) { + $fromEncoding = 'Windows-1252'; + } + if ('UTF-8' !== $fromEncoding) { + $s = iconv($fromEncoding, 'UTF-8', $s); + } + + return preg_replace_callback('/[\x80-\xFF]+/', array(__CLASS__, 'html_encoding_callback'), $s); + } + + if ('HTML-ENTITIES' === $fromEncoding) { + $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8'); + $fromEncoding = 'UTF-8'; + } + + return iconv($fromEncoding, $toEncoding, $s); + } + + public static function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) + { + $vars = array(&$a, &$b, &$c, &$d, &$e, &$f); + + $ok = true; + array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) { + if (false === $v = Mbstring::mb_convert_encoding($v, $toEncoding, $fromEncoding)) { + $ok = false; + } + }); + + return $ok ? $fromEncoding : false; + } + + public static function mb_decode_mimeheader($s) + { + return iconv_mime_decode($s, 2, self::$internalEncoding); + } + + public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null) + { + trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', E_USER_WARNING); + } + + public static function mb_convert_case($s, $mode, $encoding = null) + { + if ('' === $s .= '') { + return ''; + } + + $encoding = self::getEncoding($encoding); + + if ('UTF-8' === $encoding) { + $encoding = null; + } else { + $s = iconv($encoding, 'UTF-8', $s); + } + + if (MB_CASE_TITLE == $mode) { + $s = preg_replace_callback('/\b\p{Ll}/u', array(__CLASS__, 'title_case_upper'), $s); + $s = preg_replace_callback('/\B[\p{Lu}\p{Lt}]+/u', array(__CLASS__, 'title_case_lower'), $s); + } else { + if (MB_CASE_UPPER == $mode) { + static $upper = null; + if (null === $upper) { + $upper = self::getData('upperCase'); + } + $map = $upper; + } else { + if (self::MB_CASE_FOLD === $mode) { + $s = str_replace(self::$caseFold[0], self::$caseFold[1], $s); + } + + static $lower = null; + if (null === $lower) { + $lower = self::getData('lowerCase'); + } + $map = $lower; + } + + static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4); + + $i = 0; + $len = strlen($s); + + while ($i < $len) { + $ulen = $s[$i] < "\x80" ? 1 : $ulenMask[$s[$i] & "\xF0"]; + $uchr = substr($s, $i, $ulen); + $i += $ulen; + + if (isset($map[$uchr])) { + $uchr = $map[$uchr]; + $nlen = strlen($uchr); + + if ($nlen == $ulen) { + $nlen = $i; + do { + $s[--$nlen] = $uchr[--$ulen]; + } while ($ulen); + } else { + $s = substr_replace($s, $uchr, $i - $ulen, $ulen); + $len += $nlen - $ulen; + $i += $nlen - $ulen; + } + } + } + } + + if (null === $encoding) { + return $s; + } + + return iconv('UTF-8', $encoding, $s); + } + + public static function mb_internal_encoding($encoding = null) + { + if (null === $encoding) { + return self::$internalEncoding; + } + + $encoding = self::getEncoding($encoding); + + if ('UTF-8' === $encoding || false !== @iconv($encoding, $encoding, ' ')) { + self::$internalEncoding = $encoding; + + return true; + } + + return false; + } + + public static function mb_language($lang = null) + { + if (null === $lang) { + return self::$language; + } + + switch ($lang = strtolower($lang)) { + case 'uni': + case 'neutral': + self::$language = $lang; + + return true; + } + + return false; + } + + public static function mb_list_encodings() + { + return array('UTF-8'); + } + + public static function mb_encoding_aliases($encoding) + { + switch (strtoupper($encoding)) { + case 'UTF8': + case 'UTF-8': + return array('utf8'); + } + + return false; + } + + public static function mb_check_encoding($var = null, $encoding = null) + { + if (null === $encoding) { + if (null === $var) { + return false; + } + $encoding = self::$internalEncoding; + } + + return self::mb_detect_encoding($var, array($encoding)) || false !== @iconv($encoding, $encoding, $var); + } + + public static function mb_detect_encoding($str, $encodingList = null, $strict = false) + { + if (null === $encodingList) { + $encodingList = self::$encodingList; + } else { + if (!is_array($encodingList)) { + $encodingList = array_map('trim', explode(',', $encodingList)); + } + $encodingList = array_map('strtoupper', $encodingList); + } + + foreach ($encodingList as $enc) { + switch ($enc) { + case 'ASCII': + if (!preg_match('/[\x80-\xFF]/', $str)) { + return $enc; + } + break; + + case 'UTF8': + case 'UTF-8': + if (preg_match('//u', $str)) { + return 'UTF-8'; + } + break; + + default: + if (0 === strncmp($enc, 'ISO-8859-', 9)) { + return $enc; + } + } + } + + return false; + } + + public static function mb_detect_order($encodingList = null) + { + if (null === $encodingList) { + return self::$encodingList; + } + + if (!is_array($encodingList)) { + $encodingList = array_map('trim', explode(',', $encodingList)); + } + $encodingList = array_map('strtoupper', $encodingList); + + foreach ($encodingList as $enc) { + switch ($enc) { + default: + if (strncmp($enc, 'ISO-8859-', 9)) { + return false; + } + case 'ASCII': + case 'UTF8': + case 'UTF-8': + } + } + + self::$encodingList = $encodingList; + + return true; + } + + public static function mb_strlen($s, $encoding = null) + { + $encoding = self::getEncoding($encoding); + + return iconv_strlen($s, $encoding); + } + + public static function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) + { + $encoding = self::getEncoding($encoding); + + if ('' === $needle .= '') { + trigger_error(__METHOD__.': Empty delimiter', E_USER_WARNING); + + return false; + } + + return iconv_strpos($haystack, $needle, $offset, $encoding); + } + + public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) + { + $encoding = self::getEncoding($encoding); + + if ($offset != (int) $offset) { + $offset = 0; + } elseif ($offset = (int) $offset) { + if ($offset < 0) { + $haystack = self::mb_substr($haystack, 0, $offset, $encoding); + $offset = 0; + } else { + $haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding); + } + } + + $pos = iconv_strrpos($haystack, $needle, $encoding); + + return false !== $pos ? $offset + $pos : false; + } + + public static function mb_strtolower($s, $encoding = null) + { + return self::mb_convert_case($s, MB_CASE_LOWER, $encoding); + } + + public static function mb_strtoupper($s, $encoding = null) + { + return self::mb_convert_case($s, MB_CASE_UPPER, $encoding); + } + + public static function mb_substitute_character($c = null) + { + if (0 === strcasecmp($c, 'none')) { + return true; + } + + return null !== $c ? false : 'none'; + } + + public static function mb_substr($s, $start, $length = null, $encoding = null) + { + $encoding = self::getEncoding($encoding); + + if ($start < 0) { + $start = iconv_strlen($s, $encoding) + $start; + if ($start < 0) { + $start = 0; + } + } + + if (null === $length) { + $length = 2147483647; + } elseif ($length < 0) { + $length = iconv_strlen($s, $encoding) + $length - $start; + if ($length < 0) { + return ''; + } + } + + return iconv_substr($s, $start, $length, $encoding).''; + } + + public static function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) + { + $haystack = self::mb_convert_case($haystack, self::MB_CASE_FOLD, $encoding); + $needle = self::mb_convert_case($needle, self::MB_CASE_FOLD, $encoding); + + return self::mb_strpos($haystack, $needle, $offset, $encoding); + } + + public static function mb_stristr($haystack, $needle, $part = false, $encoding = null) + { + $pos = self::mb_stripos($haystack, $needle, 0, $encoding); + + return self::getSubpart($pos, $part, $haystack, $encoding); + } + + public static function mb_strrchr($haystack, $needle, $part = false, $encoding = null) + { + $encoding = self::getEncoding($encoding); + $needle = self::mb_substr($needle, 0, 1, $encoding); + $pos = iconv_strrpos($haystack, $needle, $encoding); + + return self::getSubpart($pos, $part, $haystack, $encoding); + } + + public static function mb_strrichr($haystack, $needle, $part = false, $encoding = null) + { + $needle = self::mb_substr($needle, 0, 1, $encoding); + $pos = self::mb_strripos($haystack, $needle, $encoding); + + return self::getSubpart($pos, $part, $haystack, $encoding); + } + + public static function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) + { + $haystack = self::mb_convert_case($haystack, self::MB_CASE_FOLD, $encoding); + $needle = self::mb_convert_case($needle, self::MB_CASE_FOLD, $encoding); + + return self::mb_strrpos($haystack, $needle, $offset, $encoding); + } + + public static function mb_strstr($haystack, $needle, $part = false, $encoding = null) + { + $pos = strpos($haystack, $needle); + if (false === $pos) { + return false; + } + if ($part) { + return substr($haystack, 0, $pos); + } + + return substr($haystack, $pos); + } + + public static function mb_get_info($type = 'all') + { + $info = array( + 'internal_encoding' => self::$internalEncoding, + 'http_output' => 'pass', + 'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)', + 'func_overload' => 0, + 'func_overload_list' => 'no overload', + 'mail_charset' => 'UTF-8', + 'mail_header_encoding' => 'BASE64', + 'mail_body_encoding' => 'BASE64', + 'illegal_chars' => 0, + 'encoding_translation' => 'Off', + 'language' => self::$language, + 'detect_order' => self::$encodingList, + 'substitute_character' => 'none', + 'strict_detection' => 'Off', + ); + + if ('all' === $type) { + return $info; + } + if (isset($info[$type])) { + return $info[$type]; + } + + return false; + } + + public static function mb_http_input($type = '') + { + return false; + } + + public static function mb_http_output($encoding = null) + { + return null !== $encoding ? 'pass' === $encoding : 'pass'; + } + + public static function mb_strwidth($s, $encoding = null) + { + $encoding = self::getEncoding($encoding); + + if ('UTF-8' !== $encoding) { + $s = iconv($encoding, 'UTF-8', $s); + } + + $s = preg_replace('/[\x{1100}-\x{115F}\x{2329}\x{232A}\x{2E80}-\x{303E}\x{3040}-\x{A4CF}\x{AC00}-\x{D7A3}\x{F900}-\x{FAFF}\x{FE10}-\x{FE19}\x{FE30}-\x{FE6F}\x{FF00}-\x{FF60}\x{FFE0}-\x{FFE6}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}]/u', '', $s, -1, $wide); + + return ($wide << 1) + iconv_strlen($s, 'UTF-8'); + } + + public static function mb_substr_count($haystack, $needle, $encoding = null) + { + return substr_count($haystack, $needle); + } + + public static function mb_output_handler($contents, $status) + { + return $contents; + } + + private static function getSubpart($pos, $part, $haystack, $encoding) + { + if (false === $pos) { + return false; + } + if ($part) { + return self::mb_substr($haystack, 0, $pos, $encoding); + } + + return self::mb_substr($haystack, $pos, null, $encoding); + } + + private static function html_encoding_callback($m) + { + $i = 1; + $entities = ''; + $m = unpack('C*', htmlentities($m[0], ENT_COMPAT, 'UTF-8')); + + while (isset($m[$i])) { + if (0x80 > $m[$i]) { + $entities .= chr($m[$i++]); + continue; + } + if (0xF0 <= $m[$i]) { + $c = (($m[$i++] - 0xF0) << 18) + (($m[$i++] - 0x80) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80; + } elseif (0xE0 <= $m[$i]) { + $c = (($m[$i++] - 0xE0) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80; + } else { + $c = (($m[$i++] - 0xC0) << 6) + $m[$i++] - 0x80; + } + + $entities .= '&#'.$c.';'; + } + + return $entities; + } + + private static function title_case_lower($s) + { + return self::mb_convert_case($s[0], MB_CASE_LOWER, 'UTF-8'); + } + + private static function title_case_upper($s) + { + return self::mb_convert_case($s[0], MB_CASE_UPPER, 'UTF-8'); + } + + private static function getData($file) + { + if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.ser')) { + return unserialize(file_get_contents($file)); + } + + return false; + } + + private static function getEncoding($encoding) + { + if (null === $encoding) { + return self::$internalEncoding; + } + + $encoding = strtoupper($encoding); + + if ('8BIT' === $encoding || 'BINARY' === $encoding) { + return 'CP850'; + } + if ('UTF8' === $encoding) { + return 'UTF-8'; + } + + return $encoding; + } +} diff --git a/vendor/symfony/polyfill-mbstring/README.md b/vendor/symfony/polyfill-mbstring/README.md new file mode 100644 index 0000000..091152f --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/README.md @@ -0,0 +1,13 @@ +Symfony Polyfill / Mbstring +=========================== + +This component provides a partial, native PHP implementation for the +[Mbstring](http://php.net/mbstring) extension. + +More information can be found in the +[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). + +License +======= + +This library is released under the [MIT license](LICENSE). \ No newline at end of file diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.ser b/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.ser new file mode 100644 index 0000000..13dabdd --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.ser @@ -0,0 +1 @@ +a:1092:{s:1:"A";s:1:"a";s:1:"B";s:1:"b";s:1:"C";s:1:"c";s:1:"D";s:1:"d";s:1:"E";s:1:"e";s:1:"F";s:1:"f";s:1:"G";s:1:"g";s:1:"H";s:1:"h";s:1:"I";s:1:"i";s:1:"J";s:1:"j";s:1:"K";s:1:"k";s:1:"L";s:1:"l";s:1:"M";s:1:"m";s:1:"N";s:1:"n";s:1:"O";s:1:"o";s:1:"P";s:1:"p";s:1:"Q";s:1:"q";s:1:"R";s:1:"r";s:1:"S";s:1:"s";s:1:"T";s:1:"t";s:1:"U";s:1:"u";s:1:"V";s:1:"v";s:1:"W";s:1:"w";s:1:"X";s:1:"x";s:1:"Y";s:1:"y";s:1:"Z";s:1:"z";s:2:"À";s:2:"à";s:2:"Á";s:2:"á";s:2:"Â";s:2:"â";s:2:"Ã";s:2:"ã";s:2:"Ä";s:2:"ä";s:2:"Å";s:2:"å";s:2:"Æ";s:2:"æ";s:2:"Ç";s:2:"ç";s:2:"È";s:2:"è";s:2:"É";s:2:"é";s:2:"Ê";s:2:"ê";s:2:"Ë";s:2:"ë";s:2:"Ì";s:2:"ì";s:2:"Í";s:2:"í";s:2:"Î";s:2:"î";s:2:"Ï";s:2:"ï";s:2:"Ð";s:2:"ð";s:2:"Ñ";s:2:"ñ";s:2:"Ò";s:2:"ò";s:2:"Ó";s:2:"ó";s:2:"Ô";s:2:"ô";s:2:"Õ";s:2:"õ";s:2:"Ö";s:2:"ö";s:2:"Ø";s:2:"ø";s:2:"Ù";s:2:"ù";s:2:"Ú";s:2:"ú";s:2:"Û";s:2:"û";s:2:"Ü";s:2:"ü";s:2:"Ý";s:2:"ý";s:2:"Þ";s:2:"þ";s:2:"Ā";s:2:"ā";s:2:"Ă";s:2:"ă";s:2:"Ą";s:2:"ą";s:2:"Ć";s:2:"ć";s:2:"Ĉ";s:2:"ĉ";s:2:"Ċ";s:2:"ċ";s:2:"Č";s:2:"č";s:2:"Ď";s:2:"ď";s:2:"Đ";s:2:"đ";s:2:"Ē";s:2:"ē";s:2:"Ĕ";s:2:"ĕ";s:2:"Ė";s:2:"ė";s:2:"Ę";s:2:"ę";s:2:"Ě";s:2:"ě";s:2:"Ĝ";s:2:"ĝ";s:2:"Ğ";s:2:"ğ";s:2:"Ġ";s:2:"ġ";s:2:"Ģ";s:2:"ģ";s:2:"Ĥ";s:2:"ĥ";s:2:"Ħ";s:2:"ħ";s:2:"Ĩ";s:2:"ĩ";s:2:"Ī";s:2:"ī";s:2:"Ĭ";s:2:"ĭ";s:2:"Į";s:2:"į";s:2:"İ";s:1:"i";s:2:"IJ";s:2:"ij";s:2:"Ĵ";s:2:"ĵ";s:2:"Ķ";s:2:"ķ";s:2:"Ĺ";s:2:"ĺ";s:2:"Ļ";s:2:"ļ";s:2:"Ľ";s:2:"ľ";s:2:"Ŀ";s:2:"ŀ";s:2:"Ł";s:2:"ł";s:2:"Ń";s:2:"ń";s:2:"Ņ";s:2:"ņ";s:2:"Ň";s:2:"ň";s:2:"Ŋ";s:2:"ŋ";s:2:"Ō";s:2:"ō";s:2:"Ŏ";s:2:"ŏ";s:2:"Ő";s:2:"ő";s:2:"Œ";s:2:"œ";s:2:"Ŕ";s:2:"ŕ";s:2:"Ŗ";s:2:"ŗ";s:2:"Ř";s:2:"ř";s:2:"Ś";s:2:"ś";s:2:"Ŝ";s:2:"ŝ";s:2:"Ş";s:2:"ş";s:2:"Š";s:2:"š";s:2:"Ţ";s:2:"ţ";s:2:"Ť";s:2:"ť";s:2:"Ŧ";s:2:"ŧ";s:2:"Ũ";s:2:"ũ";s:2:"Ū";s:2:"ū";s:2:"Ŭ";s:2:"ŭ";s:2:"Ů";s:2:"ů";s:2:"Ű";s:2:"ű";s:2:"Ų";s:2:"ų";s:2:"Ŵ";s:2:"ŵ";s:2:"Ŷ";s:2:"ŷ";s:2:"Ÿ";s:2:"ÿ";s:2:"Ź";s:2:"ź";s:2:"Ż";s:2:"ż";s:2:"Ž";s:2:"ž";s:2:"Ɓ";s:2:"ɓ";s:2:"Ƃ";s:2:"ƃ";s:2:"Ƅ";s:2:"ƅ";s:2:"Ɔ";s:2:"ɔ";s:2:"Ƈ";s:2:"ƈ";s:2:"Ɖ";s:2:"ɖ";s:2:"Ɗ";s:2:"ɗ";s:2:"Ƌ";s:2:"ƌ";s:2:"Ǝ";s:2:"ǝ";s:2:"Ə";s:2:"ə";s:2:"Ɛ";s:2:"ɛ";s:2:"Ƒ";s:2:"ƒ";s:2:"Ɠ";s:2:"ɠ";s:2:"Ɣ";s:2:"ɣ";s:2:"Ɩ";s:2:"ɩ";s:2:"Ɨ";s:2:"ɨ";s:2:"Ƙ";s:2:"ƙ";s:2:"Ɯ";s:2:"ɯ";s:2:"Ɲ";s:2:"ɲ";s:2:"Ɵ";s:2:"ɵ";s:2:"Ơ";s:2:"ơ";s:2:"Ƣ";s:2:"ƣ";s:2:"Ƥ";s:2:"ƥ";s:2:"Ʀ";s:2:"ʀ";s:2:"Ƨ";s:2:"ƨ";s:2:"Ʃ";s:2:"ʃ";s:2:"Ƭ";s:2:"ƭ";s:2:"Ʈ";s:2:"ʈ";s:2:"Ư";s:2:"ư";s:2:"Ʊ";s:2:"ʊ";s:2:"Ʋ";s:2:"ʋ";s:2:"Ƴ";s:2:"ƴ";s:2:"Ƶ";s:2:"ƶ";s:2:"Ʒ";s:2:"ʒ";s:2:"Ƹ";s:2:"ƹ";s:2:"Ƽ";s:2:"ƽ";s:2:"DŽ";s:2:"dž";s:2:"Dž";s:2:"dž";s:2:"LJ";s:2:"lj";s:2:"Lj";s:2:"lj";s:2:"NJ";s:2:"nj";s:2:"Nj";s:2:"nj";s:2:"Ǎ";s:2:"ǎ";s:2:"Ǐ";s:2:"ǐ";s:2:"Ǒ";s:2:"ǒ";s:2:"Ǔ";s:2:"ǔ";s:2:"Ǖ";s:2:"ǖ";s:2:"Ǘ";s:2:"ǘ";s:2:"Ǚ";s:2:"ǚ";s:2:"Ǜ";s:2:"ǜ";s:2:"Ǟ";s:2:"ǟ";s:2:"Ǡ";s:2:"ǡ";s:2:"Ǣ";s:2:"ǣ";s:2:"Ǥ";s:2:"ǥ";s:2:"Ǧ";s:2:"ǧ";s:2:"Ǩ";s:2:"ǩ";s:2:"Ǫ";s:2:"ǫ";s:2:"Ǭ";s:2:"ǭ";s:2:"Ǯ";s:2:"ǯ";s:2:"DZ";s:2:"dz";s:2:"Dz";s:2:"dz";s:2:"Ǵ";s:2:"ǵ";s:2:"Ƕ";s:2:"ƕ";s:2:"Ƿ";s:2:"ƿ";s:2:"Ǹ";s:2:"ǹ";s:2:"Ǻ";s:2:"ǻ";s:2:"Ǽ";s:2:"ǽ";s:2:"Ǿ";s:2:"ǿ";s:2:"Ȁ";s:2:"ȁ";s:2:"Ȃ";s:2:"ȃ";s:2:"Ȅ";s:2:"ȅ";s:2:"Ȇ";s:2:"ȇ";s:2:"Ȉ";s:2:"ȉ";s:2:"Ȋ";s:2:"ȋ";s:2:"Ȍ";s:2:"ȍ";s:2:"Ȏ";s:2:"ȏ";s:2:"Ȑ";s:2:"ȑ";s:2:"Ȓ";s:2:"ȓ";s:2:"Ȕ";s:2:"ȕ";s:2:"Ȗ";s:2:"ȗ";s:2:"Ș";s:2:"ș";s:2:"Ț";s:2:"ț";s:2:"Ȝ";s:2:"ȝ";s:2:"Ȟ";s:2:"ȟ";s:2:"Ƞ";s:2:"ƞ";s:2:"Ȣ";s:2:"ȣ";s:2:"Ȥ";s:2:"ȥ";s:2:"Ȧ";s:2:"ȧ";s:2:"Ȩ";s:2:"ȩ";s:2:"Ȫ";s:2:"ȫ";s:2:"Ȭ";s:2:"ȭ";s:2:"Ȯ";s:2:"ȯ";s:2:"Ȱ";s:2:"ȱ";s:2:"Ȳ";s:2:"ȳ";s:2:"Ⱥ";s:3:"ⱥ";s:2:"Ȼ";s:2:"ȼ";s:2:"Ƚ";s:2:"ƚ";s:2:"Ⱦ";s:3:"ⱦ";s:2:"Ɂ";s:2:"ɂ";s:2:"Ƀ";s:2:"ƀ";s:2:"Ʉ";s:2:"ʉ";s:2:"Ʌ";s:2:"ʌ";s:2:"Ɇ";s:2:"ɇ";s:2:"Ɉ";s:2:"ɉ";s:2:"Ɋ";s:2:"ɋ";s:2:"Ɍ";s:2:"ɍ";s:2:"Ɏ";s:2:"ɏ";s:2:"Ͱ";s:2:"ͱ";s:2:"Ͳ";s:2:"ͳ";s:2:"Ͷ";s:2:"ͷ";s:2:"Ϳ";s:2:"ϳ";s:2:"Ά";s:2:"ά";s:2:"Έ";s:2:"έ";s:2:"Ή";s:2:"ή";s:2:"Ί";s:2:"ί";s:2:"Ό";s:2:"ό";s:2:"Ύ";s:2:"ύ";s:2:"Ώ";s:2:"ώ";s:2:"Α";s:2:"α";s:2:"Β";s:2:"β";s:2:"Γ";s:2:"γ";s:2:"Δ";s:2:"δ";s:2:"Ε";s:2:"ε";s:2:"Ζ";s:2:"ζ";s:2:"Η";s:2:"η";s:2:"Θ";s:2:"θ";s:2:"Ι";s:2:"ι";s:2:"Κ";s:2:"κ";s:2:"Λ";s:2:"λ";s:2:"Μ";s:2:"μ";s:2:"Ν";s:2:"ν";s:2:"Ξ";s:2:"ξ";s:2:"Ο";s:2:"ο";s:2:"Π";s:2:"π";s:2:"Ρ";s:2:"ρ";s:2:"Σ";s:2:"σ";s:2:"Τ";s:2:"τ";s:2:"Υ";s:2:"υ";s:2:"Φ";s:2:"φ";s:2:"Χ";s:2:"χ";s:2:"Ψ";s:2:"ψ";s:2:"Ω";s:2:"ω";s:2:"Ϊ";s:2:"ϊ";s:2:"Ϋ";s:2:"ϋ";s:2:"Ϗ";s:2:"ϗ";s:2:"Ϙ";s:2:"ϙ";s:2:"Ϛ";s:2:"ϛ";s:2:"Ϝ";s:2:"ϝ";s:2:"Ϟ";s:2:"ϟ";s:2:"Ϡ";s:2:"ϡ";s:2:"Ϣ";s:2:"ϣ";s:2:"Ϥ";s:2:"ϥ";s:2:"Ϧ";s:2:"ϧ";s:2:"Ϩ";s:2:"ϩ";s:2:"Ϫ";s:2:"ϫ";s:2:"Ϭ";s:2:"ϭ";s:2:"Ϯ";s:2:"ϯ";s:2:"ϴ";s:2:"θ";s:2:"Ϸ";s:2:"ϸ";s:2:"Ϲ";s:2:"ϲ";s:2:"Ϻ";s:2:"ϻ";s:2:"Ͻ";s:2:"ͻ";s:2:"Ͼ";s:2:"ͼ";s:2:"Ͽ";s:2:"ͽ";s:2:"Ѐ";s:2:"ѐ";s:2:"Ё";s:2:"ё";s:2:"Ђ";s:2:"ђ";s:2:"Ѓ";s:2:"ѓ";s:2:"Є";s:2:"є";s:2:"Ѕ";s:2:"ѕ";s:2:"І";s:2:"і";s:2:"Ї";s:2:"ї";s:2:"Ј";s:2:"ј";s:2:"Љ";s:2:"љ";s:2:"Њ";s:2:"њ";s:2:"Ћ";s:2:"ћ";s:2:"Ќ";s:2:"ќ";s:2:"Ѝ";s:2:"ѝ";s:2:"Ў";s:2:"ў";s:2:"Џ";s:2:"џ";s:2:"А";s:2:"а";s:2:"Б";s:2:"б";s:2:"В";s:2:"в";s:2:"Г";s:2:"г";s:2:"Д";s:2:"д";s:2:"Е";s:2:"е";s:2:"Ж";s:2:"ж";s:2:"З";s:2:"з";s:2:"И";s:2:"и";s:2:"Й";s:2:"й";s:2:"К";s:2:"к";s:2:"Л";s:2:"л";s:2:"М";s:2:"м";s:2:"Н";s:2:"н";s:2:"О";s:2:"о";s:2:"П";s:2:"п";s:2:"Р";s:2:"р";s:2:"С";s:2:"с";s:2:"Т";s:2:"т";s:2:"У";s:2:"у";s:2:"Ф";s:2:"ф";s:2:"Х";s:2:"х";s:2:"Ц";s:2:"ц";s:2:"Ч";s:2:"ч";s:2:"Ш";s:2:"ш";s:2:"Щ";s:2:"щ";s:2:"Ъ";s:2:"ъ";s:2:"Ы";s:2:"ы";s:2:"Ь";s:2:"ь";s:2:"Э";s:2:"э";s:2:"Ю";s:2:"ю";s:2:"Я";s:2:"я";s:2:"Ѡ";s:2:"ѡ";s:2:"Ѣ";s:2:"ѣ";s:2:"Ѥ";s:2:"ѥ";s:2:"Ѧ";s:2:"ѧ";s:2:"Ѩ";s:2:"ѩ";s:2:"Ѫ";s:2:"ѫ";s:2:"Ѭ";s:2:"ѭ";s:2:"Ѯ";s:2:"ѯ";s:2:"Ѱ";s:2:"ѱ";s:2:"Ѳ";s:2:"ѳ";s:2:"Ѵ";s:2:"ѵ";s:2:"Ѷ";s:2:"ѷ";s:2:"Ѹ";s:2:"ѹ";s:2:"Ѻ";s:2:"ѻ";s:2:"Ѽ";s:2:"ѽ";s:2:"Ѿ";s:2:"ѿ";s:2:"Ҁ";s:2:"ҁ";s:2:"Ҋ";s:2:"ҋ";s:2:"Ҍ";s:2:"ҍ";s:2:"Ҏ";s:2:"ҏ";s:2:"Ґ";s:2:"ґ";s:2:"Ғ";s:2:"ғ";s:2:"Ҕ";s:2:"ҕ";s:2:"Җ";s:2:"җ";s:2:"Ҙ";s:2:"ҙ";s:2:"Қ";s:2:"қ";s:2:"Ҝ";s:2:"ҝ";s:2:"Ҟ";s:2:"ҟ";s:2:"Ҡ";s:2:"ҡ";s:2:"Ң";s:2:"ң";s:2:"Ҥ";s:2:"ҥ";s:2:"Ҧ";s:2:"ҧ";s:2:"Ҩ";s:2:"ҩ";s:2:"Ҫ";s:2:"ҫ";s:2:"Ҭ";s:2:"ҭ";s:2:"Ү";s:2:"ү";s:2:"Ұ";s:2:"ұ";s:2:"Ҳ";s:2:"ҳ";s:2:"Ҵ";s:2:"ҵ";s:2:"Ҷ";s:2:"ҷ";s:2:"Ҹ";s:2:"ҹ";s:2:"Һ";s:2:"һ";s:2:"Ҽ";s:2:"ҽ";s:2:"Ҿ";s:2:"ҿ";s:2:"Ӏ";s:2:"ӏ";s:2:"Ӂ";s:2:"ӂ";s:2:"Ӄ";s:2:"ӄ";s:2:"Ӆ";s:2:"ӆ";s:2:"Ӈ";s:2:"ӈ";s:2:"Ӊ";s:2:"ӊ";s:2:"Ӌ";s:2:"ӌ";s:2:"Ӎ";s:2:"ӎ";s:2:"Ӑ";s:2:"ӑ";s:2:"Ӓ";s:2:"ӓ";s:2:"Ӕ";s:2:"ӕ";s:2:"Ӗ";s:2:"ӗ";s:2:"Ә";s:2:"ә";s:2:"Ӛ";s:2:"ӛ";s:2:"Ӝ";s:2:"ӝ";s:2:"Ӟ";s:2:"ӟ";s:2:"Ӡ";s:2:"ӡ";s:2:"Ӣ";s:2:"ӣ";s:2:"Ӥ";s:2:"ӥ";s:2:"Ӧ";s:2:"ӧ";s:2:"Ө";s:2:"ө";s:2:"Ӫ";s:2:"ӫ";s:2:"Ӭ";s:2:"ӭ";s:2:"Ӯ";s:2:"ӯ";s:2:"Ӱ";s:2:"ӱ";s:2:"Ӳ";s:2:"ӳ";s:2:"Ӵ";s:2:"ӵ";s:2:"Ӷ";s:2:"ӷ";s:2:"Ӹ";s:2:"ӹ";s:2:"Ӻ";s:2:"ӻ";s:2:"Ӽ";s:2:"ӽ";s:2:"Ӿ";s:2:"ӿ";s:2:"Ԁ";s:2:"ԁ";s:2:"Ԃ";s:2:"ԃ";s:2:"Ԅ";s:2:"ԅ";s:2:"Ԇ";s:2:"ԇ";s:2:"Ԉ";s:2:"ԉ";s:2:"Ԋ";s:2:"ԋ";s:2:"Ԍ";s:2:"ԍ";s:2:"Ԏ";s:2:"ԏ";s:2:"Ԑ";s:2:"ԑ";s:2:"Ԓ";s:2:"ԓ";s:2:"Ԕ";s:2:"ԕ";s:2:"Ԗ";s:2:"ԗ";s:2:"Ԙ";s:2:"ԙ";s:2:"Ԛ";s:2:"ԛ";s:2:"Ԝ";s:2:"ԝ";s:2:"Ԟ";s:2:"ԟ";s:2:"Ԡ";s:2:"ԡ";s:2:"Ԣ";s:2:"ԣ";s:2:"Ԥ";s:2:"ԥ";s:2:"Ԧ";s:2:"ԧ";s:2:"Ԩ";s:2:"ԩ";s:2:"Ԫ";s:2:"ԫ";s:2:"Ԭ";s:2:"ԭ";s:2:"Ԯ";s:2:"ԯ";s:2:"Ա";s:2:"ա";s:2:"Բ";s:2:"բ";s:2:"Գ";s:2:"գ";s:2:"Դ";s:2:"դ";s:2:"Ե";s:2:"ե";s:2:"Զ";s:2:"զ";s:2:"Է";s:2:"է";s:2:"Ը";s:2:"ը";s:2:"Թ";s:2:"թ";s:2:"Ժ";s:2:"ժ";s:2:"Ի";s:2:"ի";s:2:"Լ";s:2:"լ";s:2:"Խ";s:2:"խ";s:2:"Ծ";s:2:"ծ";s:2:"Կ";s:2:"կ";s:2:"Հ";s:2:"հ";s:2:"Ձ";s:2:"ձ";s:2:"Ղ";s:2:"ղ";s:2:"Ճ";s:2:"ճ";s:2:"Մ";s:2:"մ";s:2:"Յ";s:2:"յ";s:2:"Ն";s:2:"ն";s:2:"Շ";s:2:"շ";s:2:"Ո";s:2:"ո";s:2:"Չ";s:2:"չ";s:2:"Պ";s:2:"պ";s:2:"Ջ";s:2:"ջ";s:2:"Ռ";s:2:"ռ";s:2:"Ս";s:2:"ս";s:2:"Վ";s:2:"վ";s:2:"Տ";s:2:"տ";s:2:"Ր";s:2:"ր";s:2:"Ց";s:2:"ց";s:2:"Ւ";s:2:"ւ";s:2:"Փ";s:2:"փ";s:2:"Ք";s:2:"ք";s:2:"Օ";s:2:"օ";s:2:"Ֆ";s:2:"ֆ";s:3:"Ⴀ";s:3:"ⴀ";s:3:"Ⴁ";s:3:"ⴁ";s:3:"Ⴂ";s:3:"ⴂ";s:3:"Ⴃ";s:3:"ⴃ";s:3:"Ⴄ";s:3:"ⴄ";s:3:"Ⴅ";s:3:"ⴅ";s:3:"Ⴆ";s:3:"ⴆ";s:3:"Ⴇ";s:3:"ⴇ";s:3:"Ⴈ";s:3:"ⴈ";s:3:"Ⴉ";s:3:"ⴉ";s:3:"Ⴊ";s:3:"ⴊ";s:3:"Ⴋ";s:3:"ⴋ";s:3:"Ⴌ";s:3:"ⴌ";s:3:"Ⴍ";s:3:"ⴍ";s:3:"Ⴎ";s:3:"ⴎ";s:3:"Ⴏ";s:3:"ⴏ";s:3:"Ⴐ";s:3:"ⴐ";s:3:"Ⴑ";s:3:"ⴑ";s:3:"Ⴒ";s:3:"ⴒ";s:3:"Ⴓ";s:3:"ⴓ";s:3:"Ⴔ";s:3:"ⴔ";s:3:"Ⴕ";s:3:"ⴕ";s:3:"Ⴖ";s:3:"ⴖ";s:3:"Ⴗ";s:3:"ⴗ";s:3:"Ⴘ";s:3:"ⴘ";s:3:"Ⴙ";s:3:"ⴙ";s:3:"Ⴚ";s:3:"ⴚ";s:3:"Ⴛ";s:3:"ⴛ";s:3:"Ⴜ";s:3:"ⴜ";s:3:"Ⴝ";s:3:"ⴝ";s:3:"Ⴞ";s:3:"ⴞ";s:3:"Ⴟ";s:3:"ⴟ";s:3:"Ⴠ";s:3:"ⴠ";s:3:"Ⴡ";s:3:"ⴡ";s:3:"Ⴢ";s:3:"ⴢ";s:3:"Ⴣ";s:3:"ⴣ";s:3:"Ⴤ";s:3:"ⴤ";s:3:"Ⴥ";s:3:"ⴥ";s:3:"Ⴧ";s:3:"ⴧ";s:3:"Ⴭ";s:3:"ⴭ";s:3:"Ḁ";s:3:"ḁ";s:3:"Ḃ";s:3:"ḃ";s:3:"Ḅ";s:3:"ḅ";s:3:"Ḇ";s:3:"ḇ";s:3:"Ḉ";s:3:"ḉ";s:3:"Ḋ";s:3:"ḋ";s:3:"Ḍ";s:3:"ḍ";s:3:"Ḏ";s:3:"ḏ";s:3:"Ḑ";s:3:"ḑ";s:3:"Ḓ";s:3:"ḓ";s:3:"Ḕ";s:3:"ḕ";s:3:"Ḗ";s:3:"ḗ";s:3:"Ḙ";s:3:"ḙ";s:3:"Ḛ";s:3:"ḛ";s:3:"Ḝ";s:3:"ḝ";s:3:"Ḟ";s:3:"ḟ";s:3:"Ḡ";s:3:"ḡ";s:3:"Ḣ";s:3:"ḣ";s:3:"Ḥ";s:3:"ḥ";s:3:"Ḧ";s:3:"ḧ";s:3:"Ḩ";s:3:"ḩ";s:3:"Ḫ";s:3:"ḫ";s:3:"Ḭ";s:3:"ḭ";s:3:"Ḯ";s:3:"ḯ";s:3:"Ḱ";s:3:"ḱ";s:3:"Ḳ";s:3:"ḳ";s:3:"Ḵ";s:3:"ḵ";s:3:"Ḷ";s:3:"ḷ";s:3:"Ḹ";s:3:"ḹ";s:3:"Ḻ";s:3:"ḻ";s:3:"Ḽ";s:3:"ḽ";s:3:"Ḿ";s:3:"ḿ";s:3:"Ṁ";s:3:"ṁ";s:3:"Ṃ";s:3:"ṃ";s:3:"Ṅ";s:3:"ṅ";s:3:"Ṇ";s:3:"ṇ";s:3:"Ṉ";s:3:"ṉ";s:3:"Ṋ";s:3:"ṋ";s:3:"Ṍ";s:3:"ṍ";s:3:"Ṏ";s:3:"ṏ";s:3:"Ṑ";s:3:"ṑ";s:3:"Ṓ";s:3:"ṓ";s:3:"Ṕ";s:3:"ṕ";s:3:"Ṗ";s:3:"ṗ";s:3:"Ṙ";s:3:"ṙ";s:3:"Ṛ";s:3:"ṛ";s:3:"Ṝ";s:3:"ṝ";s:3:"Ṟ";s:3:"ṟ";s:3:"Ṡ";s:3:"ṡ";s:3:"Ṣ";s:3:"ṣ";s:3:"Ṥ";s:3:"ṥ";s:3:"Ṧ";s:3:"ṧ";s:3:"Ṩ";s:3:"ṩ";s:3:"Ṫ";s:3:"ṫ";s:3:"Ṭ";s:3:"ṭ";s:3:"Ṯ";s:3:"ṯ";s:3:"Ṱ";s:3:"ṱ";s:3:"Ṳ";s:3:"ṳ";s:3:"Ṵ";s:3:"ṵ";s:3:"Ṷ";s:3:"ṷ";s:3:"Ṹ";s:3:"ṹ";s:3:"Ṻ";s:3:"ṻ";s:3:"Ṽ";s:3:"ṽ";s:3:"Ṿ";s:3:"ṿ";s:3:"Ẁ";s:3:"ẁ";s:3:"Ẃ";s:3:"ẃ";s:3:"Ẅ";s:3:"ẅ";s:3:"Ẇ";s:3:"ẇ";s:3:"Ẉ";s:3:"ẉ";s:3:"Ẋ";s:3:"ẋ";s:3:"Ẍ";s:3:"ẍ";s:3:"Ẏ";s:3:"ẏ";s:3:"Ẑ";s:3:"ẑ";s:3:"Ẓ";s:3:"ẓ";s:3:"Ẕ";s:3:"ẕ";s:3:"ẞ";s:2:"ß";s:3:"Ạ";s:3:"ạ";s:3:"Ả";s:3:"ả";s:3:"Ấ";s:3:"ấ";s:3:"Ầ";s:3:"ầ";s:3:"Ẩ";s:3:"ẩ";s:3:"Ẫ";s:3:"ẫ";s:3:"Ậ";s:3:"ậ";s:3:"Ắ";s:3:"ắ";s:3:"Ằ";s:3:"ằ";s:3:"Ẳ";s:3:"ẳ";s:3:"Ẵ";s:3:"ẵ";s:3:"Ặ";s:3:"ặ";s:3:"Ẹ";s:3:"ẹ";s:3:"Ẻ";s:3:"ẻ";s:3:"Ẽ";s:3:"ẽ";s:3:"Ế";s:3:"ế";s:3:"Ề";s:3:"ề";s:3:"Ể";s:3:"ể";s:3:"Ễ";s:3:"ễ";s:3:"Ệ";s:3:"ệ";s:3:"Ỉ";s:3:"ỉ";s:3:"Ị";s:3:"ị";s:3:"Ọ";s:3:"ọ";s:3:"Ỏ";s:3:"ỏ";s:3:"Ố";s:3:"ố";s:3:"Ồ";s:3:"ồ";s:3:"Ổ";s:3:"ổ";s:3:"Ỗ";s:3:"ỗ";s:3:"Ộ";s:3:"ộ";s:3:"Ớ";s:3:"ớ";s:3:"Ờ";s:3:"ờ";s:3:"Ở";s:3:"ở";s:3:"Ỡ";s:3:"ỡ";s:3:"Ợ";s:3:"ợ";s:3:"Ụ";s:3:"ụ";s:3:"Ủ";s:3:"ủ";s:3:"Ứ";s:3:"ứ";s:3:"Ừ";s:3:"ừ";s:3:"Ử";s:3:"ử";s:3:"Ữ";s:3:"ữ";s:3:"Ự";s:3:"ự";s:3:"Ỳ";s:3:"ỳ";s:3:"Ỵ";s:3:"ỵ";s:3:"Ỷ";s:3:"ỷ";s:3:"Ỹ";s:3:"ỹ";s:3:"Ỻ";s:3:"ỻ";s:3:"Ỽ";s:3:"ỽ";s:3:"Ỿ";s:3:"ỿ";s:3:"Ἀ";s:3:"ἀ";s:3:"Ἁ";s:3:"ἁ";s:3:"Ἂ";s:3:"ἂ";s:3:"Ἃ";s:3:"ἃ";s:3:"Ἄ";s:3:"ἄ";s:3:"Ἅ";s:3:"ἅ";s:3:"Ἆ";s:3:"ἆ";s:3:"Ἇ";s:3:"ἇ";s:3:"Ἐ";s:3:"ἐ";s:3:"Ἑ";s:3:"ἑ";s:3:"Ἒ";s:3:"ἒ";s:3:"Ἓ";s:3:"ἓ";s:3:"Ἔ";s:3:"ἔ";s:3:"Ἕ";s:3:"ἕ";s:3:"Ἠ";s:3:"ἠ";s:3:"Ἡ";s:3:"ἡ";s:3:"Ἢ";s:3:"ἢ";s:3:"Ἣ";s:3:"ἣ";s:3:"Ἤ";s:3:"ἤ";s:3:"Ἥ";s:3:"ἥ";s:3:"Ἦ";s:3:"ἦ";s:3:"Ἧ";s:3:"ἧ";s:3:"Ἰ";s:3:"ἰ";s:3:"Ἱ";s:3:"ἱ";s:3:"Ἲ";s:3:"ἲ";s:3:"Ἳ";s:3:"ἳ";s:3:"Ἴ";s:3:"ἴ";s:3:"Ἵ";s:3:"ἵ";s:3:"Ἶ";s:3:"ἶ";s:3:"Ἷ";s:3:"ἷ";s:3:"Ὀ";s:3:"ὀ";s:3:"Ὁ";s:3:"ὁ";s:3:"Ὂ";s:3:"ὂ";s:3:"Ὃ";s:3:"ὃ";s:3:"Ὄ";s:3:"ὄ";s:3:"Ὅ";s:3:"ὅ";s:3:"Ὑ";s:3:"ὑ";s:3:"Ὓ";s:3:"ὓ";s:3:"Ὕ";s:3:"ὕ";s:3:"Ὗ";s:3:"ὗ";s:3:"Ὠ";s:3:"ὠ";s:3:"Ὡ";s:3:"ὡ";s:3:"Ὢ";s:3:"ὢ";s:3:"Ὣ";s:3:"ὣ";s:3:"Ὤ";s:3:"ὤ";s:3:"Ὥ";s:3:"ὥ";s:3:"Ὦ";s:3:"ὦ";s:3:"Ὧ";s:3:"ὧ";s:3:"ᾈ";s:3:"ᾀ";s:3:"ᾉ";s:3:"ᾁ";s:3:"ᾊ";s:3:"ᾂ";s:3:"ᾋ";s:3:"ᾃ";s:3:"ᾌ";s:3:"ᾄ";s:3:"ᾍ";s:3:"ᾅ";s:3:"ᾎ";s:3:"ᾆ";s:3:"ᾏ";s:3:"ᾇ";s:3:"ᾘ";s:3:"ᾐ";s:3:"ᾙ";s:3:"ᾑ";s:3:"ᾚ";s:3:"ᾒ";s:3:"ᾛ";s:3:"ᾓ";s:3:"ᾜ";s:3:"ᾔ";s:3:"ᾝ";s:3:"ᾕ";s:3:"ᾞ";s:3:"ᾖ";s:3:"ᾟ";s:3:"ᾗ";s:3:"ᾨ";s:3:"ᾠ";s:3:"ᾩ";s:3:"ᾡ";s:3:"ᾪ";s:3:"ᾢ";s:3:"ᾫ";s:3:"ᾣ";s:3:"ᾬ";s:3:"ᾤ";s:3:"ᾭ";s:3:"ᾥ";s:3:"ᾮ";s:3:"ᾦ";s:3:"ᾯ";s:3:"ᾧ";s:3:"Ᾰ";s:3:"ᾰ";s:3:"Ᾱ";s:3:"ᾱ";s:3:"Ὰ";s:3:"ὰ";s:3:"Ά";s:3:"ά";s:3:"ᾼ";s:3:"ᾳ";s:3:"Ὲ";s:3:"ὲ";s:3:"Έ";s:3:"έ";s:3:"Ὴ";s:3:"ὴ";s:3:"Ή";s:3:"ή";s:3:"ῌ";s:3:"ῃ";s:3:"Ῐ";s:3:"ῐ";s:3:"Ῑ";s:3:"ῑ";s:3:"Ὶ";s:3:"ὶ";s:3:"Ί";s:3:"ί";s:3:"Ῠ";s:3:"ῠ";s:3:"Ῡ";s:3:"ῡ";s:3:"Ὺ";s:3:"ὺ";s:3:"Ύ";s:3:"ύ";s:3:"Ῥ";s:3:"ῥ";s:3:"Ὸ";s:3:"ὸ";s:3:"Ό";s:3:"ό";s:3:"Ὼ";s:3:"ὼ";s:3:"Ώ";s:3:"ώ";s:3:"ῼ";s:3:"ῳ";s:3:"Ω";s:2:"ω";s:3:"K";s:1:"k";s:3:"Å";s:2:"å";s:3:"Ⅎ";s:3:"ⅎ";s:3:"Ⅰ";s:3:"ⅰ";s:3:"Ⅱ";s:3:"ⅱ";s:3:"Ⅲ";s:3:"ⅲ";s:3:"Ⅳ";s:3:"ⅳ";s:3:"Ⅴ";s:3:"ⅴ";s:3:"Ⅵ";s:3:"ⅵ";s:3:"Ⅶ";s:3:"ⅶ";s:3:"Ⅷ";s:3:"ⅷ";s:3:"Ⅸ";s:3:"ⅸ";s:3:"Ⅹ";s:3:"ⅹ";s:3:"Ⅺ";s:3:"ⅺ";s:3:"Ⅻ";s:3:"ⅻ";s:3:"Ⅼ";s:3:"ⅼ";s:3:"Ⅽ";s:3:"ⅽ";s:3:"Ⅾ";s:3:"ⅾ";s:3:"Ⅿ";s:3:"ⅿ";s:3:"Ↄ";s:3:"ↄ";s:3:"Ⓐ";s:3:"ⓐ";s:3:"Ⓑ";s:3:"ⓑ";s:3:"Ⓒ";s:3:"ⓒ";s:3:"Ⓓ";s:3:"ⓓ";s:3:"Ⓔ";s:3:"ⓔ";s:3:"Ⓕ";s:3:"ⓕ";s:3:"Ⓖ";s:3:"ⓖ";s:3:"Ⓗ";s:3:"ⓗ";s:3:"Ⓘ";s:3:"ⓘ";s:3:"Ⓙ";s:3:"ⓙ";s:3:"Ⓚ";s:3:"ⓚ";s:3:"Ⓛ";s:3:"ⓛ";s:3:"Ⓜ";s:3:"ⓜ";s:3:"Ⓝ";s:3:"ⓝ";s:3:"Ⓞ";s:3:"ⓞ";s:3:"Ⓟ";s:3:"ⓟ";s:3:"Ⓠ";s:3:"ⓠ";s:3:"Ⓡ";s:3:"ⓡ";s:3:"Ⓢ";s:3:"ⓢ";s:3:"Ⓣ";s:3:"ⓣ";s:3:"Ⓤ";s:3:"ⓤ";s:3:"Ⓥ";s:3:"ⓥ";s:3:"Ⓦ";s:3:"ⓦ";s:3:"Ⓧ";s:3:"ⓧ";s:3:"Ⓨ";s:3:"ⓨ";s:3:"Ⓩ";s:3:"ⓩ";s:3:"Ⰰ";s:3:"ⰰ";s:3:"Ⰱ";s:3:"ⰱ";s:3:"Ⰲ";s:3:"ⰲ";s:3:"Ⰳ";s:3:"ⰳ";s:3:"Ⰴ";s:3:"ⰴ";s:3:"Ⰵ";s:3:"ⰵ";s:3:"Ⰶ";s:3:"ⰶ";s:3:"Ⰷ";s:3:"ⰷ";s:3:"Ⰸ";s:3:"ⰸ";s:3:"Ⰹ";s:3:"ⰹ";s:3:"Ⰺ";s:3:"ⰺ";s:3:"Ⰻ";s:3:"ⰻ";s:3:"Ⰼ";s:3:"ⰼ";s:3:"Ⰽ";s:3:"ⰽ";s:3:"Ⰾ";s:3:"ⰾ";s:3:"Ⰿ";s:3:"ⰿ";s:3:"Ⱀ";s:3:"ⱀ";s:3:"Ⱁ";s:3:"ⱁ";s:3:"Ⱂ";s:3:"ⱂ";s:3:"Ⱃ";s:3:"ⱃ";s:3:"Ⱄ";s:3:"ⱄ";s:3:"Ⱅ";s:3:"ⱅ";s:3:"Ⱆ";s:3:"ⱆ";s:3:"Ⱇ";s:3:"ⱇ";s:3:"Ⱈ";s:3:"ⱈ";s:3:"Ⱉ";s:3:"ⱉ";s:3:"Ⱊ";s:3:"ⱊ";s:3:"Ⱋ";s:3:"ⱋ";s:3:"Ⱌ";s:3:"ⱌ";s:3:"Ⱍ";s:3:"ⱍ";s:3:"Ⱎ";s:3:"ⱎ";s:3:"Ⱏ";s:3:"ⱏ";s:3:"Ⱐ";s:3:"ⱐ";s:3:"Ⱑ";s:3:"ⱑ";s:3:"Ⱒ";s:3:"ⱒ";s:3:"Ⱓ";s:3:"ⱓ";s:3:"Ⱔ";s:3:"ⱔ";s:3:"Ⱕ";s:3:"ⱕ";s:3:"Ⱖ";s:3:"ⱖ";s:3:"Ⱗ";s:3:"ⱗ";s:3:"Ⱘ";s:3:"ⱘ";s:3:"Ⱙ";s:3:"ⱙ";s:3:"Ⱚ";s:3:"ⱚ";s:3:"Ⱛ";s:3:"ⱛ";s:3:"Ⱜ";s:3:"ⱜ";s:3:"Ⱝ";s:3:"ⱝ";s:3:"Ⱞ";s:3:"ⱞ";s:3:"Ⱡ";s:3:"ⱡ";s:3:"Ɫ";s:2:"ɫ";s:3:"Ᵽ";s:3:"ᵽ";s:3:"Ɽ";s:2:"ɽ";s:3:"Ⱨ";s:3:"ⱨ";s:3:"Ⱪ";s:3:"ⱪ";s:3:"Ⱬ";s:3:"ⱬ";s:3:"Ɑ";s:2:"ɑ";s:3:"Ɱ";s:2:"ɱ";s:3:"Ɐ";s:2:"ɐ";s:3:"Ɒ";s:2:"ɒ";s:3:"Ⱳ";s:3:"ⱳ";s:3:"Ⱶ";s:3:"ⱶ";s:3:"Ȿ";s:2:"ȿ";s:3:"Ɀ";s:2:"ɀ";s:3:"Ⲁ";s:3:"ⲁ";s:3:"Ⲃ";s:3:"ⲃ";s:3:"Ⲅ";s:3:"ⲅ";s:3:"Ⲇ";s:3:"ⲇ";s:3:"Ⲉ";s:3:"ⲉ";s:3:"Ⲋ";s:3:"ⲋ";s:3:"Ⲍ";s:3:"ⲍ";s:3:"Ⲏ";s:3:"ⲏ";s:3:"Ⲑ";s:3:"ⲑ";s:3:"Ⲓ";s:3:"ⲓ";s:3:"Ⲕ";s:3:"ⲕ";s:3:"Ⲗ";s:3:"ⲗ";s:3:"Ⲙ";s:3:"ⲙ";s:3:"Ⲛ";s:3:"ⲛ";s:3:"Ⲝ";s:3:"ⲝ";s:3:"Ⲟ";s:3:"ⲟ";s:3:"Ⲡ";s:3:"ⲡ";s:3:"Ⲣ";s:3:"ⲣ";s:3:"Ⲥ";s:3:"ⲥ";s:3:"Ⲧ";s:3:"ⲧ";s:3:"Ⲩ";s:3:"ⲩ";s:3:"Ⲫ";s:3:"ⲫ";s:3:"Ⲭ";s:3:"ⲭ";s:3:"Ⲯ";s:3:"ⲯ";s:3:"Ⲱ";s:3:"ⲱ";s:3:"Ⲳ";s:3:"ⲳ";s:3:"Ⲵ";s:3:"ⲵ";s:3:"Ⲷ";s:3:"ⲷ";s:3:"Ⲹ";s:3:"ⲹ";s:3:"Ⲻ";s:3:"ⲻ";s:3:"Ⲽ";s:3:"ⲽ";s:3:"Ⲿ";s:3:"ⲿ";s:3:"Ⳁ";s:3:"ⳁ";s:3:"Ⳃ";s:3:"ⳃ";s:3:"Ⳅ";s:3:"ⳅ";s:3:"Ⳇ";s:3:"ⳇ";s:3:"Ⳉ";s:3:"ⳉ";s:3:"Ⳋ";s:3:"ⳋ";s:3:"Ⳍ";s:3:"ⳍ";s:3:"Ⳏ";s:3:"ⳏ";s:3:"Ⳑ";s:3:"ⳑ";s:3:"Ⳓ";s:3:"ⳓ";s:3:"Ⳕ";s:3:"ⳕ";s:3:"Ⳗ";s:3:"ⳗ";s:3:"Ⳙ";s:3:"ⳙ";s:3:"Ⳛ";s:3:"ⳛ";s:3:"Ⳝ";s:3:"ⳝ";s:3:"Ⳟ";s:3:"ⳟ";s:3:"Ⳡ";s:3:"ⳡ";s:3:"Ⳣ";s:3:"ⳣ";s:3:"Ⳬ";s:3:"ⳬ";s:3:"Ⳮ";s:3:"ⳮ";s:3:"Ⳳ";s:3:"ⳳ";s:3:"Ꙁ";s:3:"ꙁ";s:3:"Ꙃ";s:3:"ꙃ";s:3:"Ꙅ";s:3:"ꙅ";s:3:"Ꙇ";s:3:"ꙇ";s:3:"Ꙉ";s:3:"ꙉ";s:3:"Ꙋ";s:3:"ꙋ";s:3:"Ꙍ";s:3:"ꙍ";s:3:"Ꙏ";s:3:"ꙏ";s:3:"Ꙑ";s:3:"ꙑ";s:3:"Ꙓ";s:3:"ꙓ";s:3:"Ꙕ";s:3:"ꙕ";s:3:"Ꙗ";s:3:"ꙗ";s:3:"Ꙙ";s:3:"ꙙ";s:3:"Ꙛ";s:3:"ꙛ";s:3:"Ꙝ";s:3:"ꙝ";s:3:"Ꙟ";s:3:"ꙟ";s:3:"Ꙡ";s:3:"ꙡ";s:3:"Ꙣ";s:3:"ꙣ";s:3:"Ꙥ";s:3:"ꙥ";s:3:"Ꙧ";s:3:"ꙧ";s:3:"Ꙩ";s:3:"ꙩ";s:3:"Ꙫ";s:3:"ꙫ";s:3:"Ꙭ";s:3:"ꙭ";s:3:"Ꚁ";s:3:"ꚁ";s:3:"Ꚃ";s:3:"ꚃ";s:3:"Ꚅ";s:3:"ꚅ";s:3:"Ꚇ";s:3:"ꚇ";s:3:"Ꚉ";s:3:"ꚉ";s:3:"Ꚋ";s:3:"ꚋ";s:3:"Ꚍ";s:3:"ꚍ";s:3:"Ꚏ";s:3:"ꚏ";s:3:"Ꚑ";s:3:"ꚑ";s:3:"Ꚓ";s:3:"ꚓ";s:3:"Ꚕ";s:3:"ꚕ";s:3:"Ꚗ";s:3:"ꚗ";s:3:"Ꚙ";s:3:"ꚙ";s:3:"Ꚛ";s:3:"ꚛ";s:3:"Ꜣ";s:3:"ꜣ";s:3:"Ꜥ";s:3:"ꜥ";s:3:"Ꜧ";s:3:"ꜧ";s:3:"Ꜩ";s:3:"ꜩ";s:3:"Ꜫ";s:3:"ꜫ";s:3:"Ꜭ";s:3:"ꜭ";s:3:"Ꜯ";s:3:"ꜯ";s:3:"Ꜳ";s:3:"ꜳ";s:3:"Ꜵ";s:3:"ꜵ";s:3:"Ꜷ";s:3:"ꜷ";s:3:"Ꜹ";s:3:"ꜹ";s:3:"Ꜻ";s:3:"ꜻ";s:3:"Ꜽ";s:3:"ꜽ";s:3:"Ꜿ";s:3:"ꜿ";s:3:"Ꝁ";s:3:"ꝁ";s:3:"Ꝃ";s:3:"ꝃ";s:3:"Ꝅ";s:3:"ꝅ";s:3:"Ꝇ";s:3:"ꝇ";s:3:"Ꝉ";s:3:"ꝉ";s:3:"Ꝋ";s:3:"ꝋ";s:3:"Ꝍ";s:3:"ꝍ";s:3:"Ꝏ";s:3:"ꝏ";s:3:"Ꝑ";s:3:"ꝑ";s:3:"Ꝓ";s:3:"ꝓ";s:3:"Ꝕ";s:3:"ꝕ";s:3:"Ꝗ";s:3:"ꝗ";s:3:"Ꝙ";s:3:"ꝙ";s:3:"Ꝛ";s:3:"ꝛ";s:3:"Ꝝ";s:3:"ꝝ";s:3:"Ꝟ";s:3:"ꝟ";s:3:"Ꝡ";s:3:"ꝡ";s:3:"Ꝣ";s:3:"ꝣ";s:3:"Ꝥ";s:3:"ꝥ";s:3:"Ꝧ";s:3:"ꝧ";s:3:"Ꝩ";s:3:"ꝩ";s:3:"Ꝫ";s:3:"ꝫ";s:3:"Ꝭ";s:3:"ꝭ";s:3:"Ꝯ";s:3:"ꝯ";s:3:"Ꝺ";s:3:"ꝺ";s:3:"Ꝼ";s:3:"ꝼ";s:3:"Ᵹ";s:3:"ᵹ";s:3:"Ꝿ";s:3:"ꝿ";s:3:"Ꞁ";s:3:"ꞁ";s:3:"Ꞃ";s:3:"ꞃ";s:3:"Ꞅ";s:3:"ꞅ";s:3:"Ꞇ";s:3:"ꞇ";s:3:"Ꞌ";s:3:"ꞌ";s:3:"Ɥ";s:2:"ɥ";s:3:"Ꞑ";s:3:"ꞑ";s:3:"Ꞓ";s:3:"ꞓ";s:3:"Ꞗ";s:3:"ꞗ";s:3:"Ꞙ";s:3:"ꞙ";s:3:"Ꞛ";s:3:"ꞛ";s:3:"Ꞝ";s:3:"ꞝ";s:3:"Ꞟ";s:3:"ꞟ";s:3:"Ꞡ";s:3:"ꞡ";s:3:"Ꞣ";s:3:"ꞣ";s:3:"Ꞥ";s:3:"ꞥ";s:3:"Ꞧ";s:3:"ꞧ";s:3:"Ꞩ";s:3:"ꞩ";s:3:"Ɦ";s:2:"ɦ";s:3:"Ɜ";s:2:"ɜ";s:3:"Ɡ";s:2:"ɡ";s:3:"Ɬ";s:2:"ɬ";s:3:"Ʞ";s:2:"ʞ";s:3:"Ʇ";s:2:"ʇ";s:3:"Ａ";s:3:"ａ";s:3:"Ｂ";s:3:"ｂ";s:3:"Ｃ";s:3:"ｃ";s:3:"Ｄ";s:3:"ｄ";s:3:"Ｅ";s:3:"ｅ";s:3:"Ｆ";s:3:"ｆ";s:3:"Ｇ";s:3:"ｇ";s:3:"Ｈ";s:3:"ｈ";s:3:"Ｉ";s:3:"ｉ";s:3:"Ｊ";s:3:"ｊ";s:3:"Ｋ";s:3:"ｋ";s:3:"Ｌ";s:3:"ｌ";s:3:"Ｍ";s:3:"ｍ";s:3:"Ｎ";s:3:"ｎ";s:3:"Ｏ";s:3:"ｏ";s:3:"Ｐ";s:3:"ｐ";s:3:"Ｑ";s:3:"ｑ";s:3:"Ｒ";s:3:"ｒ";s:3:"Ｓ";s:3:"ｓ";s:3:"Ｔ";s:3:"ｔ";s:3:"Ｕ";s:3:"ｕ";s:3:"Ｖ";s:3:"ｖ";s:3:"Ｗ";s:3:"ｗ";s:3:"Ｘ";s:3:"ｘ";s:3:"Ｙ";s:3:"ｙ";s:3:"Ｚ";s:3:"ｚ";s:4:"𐐀";s:4:"𐐨";s:4:"𐐁";s:4:"𐐩";s:4:"𐐂";s:4:"𐐪";s:4:"𐐃";s:4:"𐐫";s:4:"𐐄";s:4:"𐐬";s:4:"𐐅";s:4:"𐐭";s:4:"𐐆";s:4:"𐐮";s:4:"𐐇";s:4:"𐐯";s:4:"𐐈";s:4:"𐐰";s:4:"𐐉";s:4:"𐐱";s:4:"𐐊";s:4:"𐐲";s:4:"𐐋";s:4:"𐐳";s:4:"𐐌";s:4:"𐐴";s:4:"𐐍";s:4:"𐐵";s:4:"𐐎";s:4:"𐐶";s:4:"𐐏";s:4:"𐐷";s:4:"𐐐";s:4:"𐐸";s:4:"𐐑";s:4:"𐐹";s:4:"𐐒";s:4:"𐐺";s:4:"𐐓";s:4:"𐐻";s:4:"𐐔";s:4:"𐐼";s:4:"𐐕";s:4:"𐐽";s:4:"𐐖";s:4:"𐐾";s:4:"𐐗";s:4:"𐐿";s:4:"𐐘";s:4:"𐑀";s:4:"𐐙";s:4:"𐑁";s:4:"𐐚";s:4:"𐑂";s:4:"𐐛";s:4:"𐑃";s:4:"𐐜";s:4:"𐑄";s:4:"𐐝";s:4:"𐑅";s:4:"𐐞";s:4:"𐑆";s:4:"𐐟";s:4:"𐑇";s:4:"𐐠";s:4:"𐑈";s:4:"𐐡";s:4:"𐑉";s:4:"𐐢";s:4:"𐑊";s:4:"𐐣";s:4:"𐑋";s:4:"𐐤";s:4:"𐑌";s:4:"𐐥";s:4:"𐑍";s:4:"𐐦";s:4:"𐑎";s:4:"𐐧";s:4:"𐑏";s:4:"𑢠";s:4:"𑣀";s:4:"𑢡";s:4:"𑣁";s:4:"𑢢";s:4:"𑣂";s:4:"𑢣";s:4:"𑣃";s:4:"𑢤";s:4:"𑣄";s:4:"𑢥";s:4:"𑣅";s:4:"𑢦";s:4:"𑣆";s:4:"𑢧";s:4:"𑣇";s:4:"𑢨";s:4:"𑣈";s:4:"𑢩";s:4:"𑣉";s:4:"𑢪";s:4:"𑣊";s:4:"𑢫";s:4:"𑣋";s:4:"𑢬";s:4:"𑣌";s:4:"𑢭";s:4:"𑣍";s:4:"𑢮";s:4:"𑣎";s:4:"𑢯";s:4:"𑣏";s:4:"𑢰";s:4:"𑣐";s:4:"𑢱";s:4:"𑣑";s:4:"𑢲";s:4:"𑣒";s:4:"𑢳";s:4:"𑣓";s:4:"𑢴";s:4:"𑣔";s:4:"𑢵";s:4:"𑣕";s:4:"𑢶";s:4:"𑣖";s:4:"𑢷";s:4:"𑣗";s:4:"𑢸";s:4:"𑣘";s:4:"𑢹";s:4:"𑣙";s:4:"𑢺";s:4:"𑣚";s:4:"𑢻";s:4:"𑣛";s:4:"𑢼";s:4:"𑣜";s:4:"𑢽";s:4:"𑣝";s:4:"𑢾";s:4:"𑣞";s:4:"𑢿";s:4:"𑣟";} \ No newline at end of file diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.ser b/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.ser new file mode 100644 index 0000000..e9e0ec2 --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.ser @@ -0,0 +1 @@ +a:1100:{s:1:"a";s:1:"A";s:1:"b";s:1:"B";s:1:"c";s:1:"C";s:1:"d";s:1:"D";s:1:"e";s:1:"E";s:1:"f";s:1:"F";s:1:"g";s:1:"G";s:1:"h";s:1:"H";s:1:"i";s:1:"I";s:1:"j";s:1:"J";s:1:"k";s:1:"K";s:1:"l";s:1:"L";s:1:"m";s:1:"M";s:1:"n";s:1:"N";s:1:"o";s:1:"O";s:1:"p";s:1:"P";s:1:"q";s:1:"Q";s:1:"r";s:1:"R";s:1:"s";s:1:"S";s:1:"t";s:1:"T";s:1:"u";s:1:"U";s:1:"v";s:1:"V";s:1:"w";s:1:"W";s:1:"x";s:1:"X";s:1:"y";s:1:"Y";s:1:"z";s:1:"Z";s:2:"µ";s:2:"Μ";s:2:"à";s:2:"À";s:2:"á";s:2:"Á";s:2:"â";s:2:"Â";s:2:"ã";s:2:"Ã";s:2:"ä";s:2:"Ä";s:2:"å";s:2:"Å";s:2:"æ";s:2:"Æ";s:2:"ç";s:2:"Ç";s:2:"è";s:2:"È";s:2:"é";s:2:"É";s:2:"ê";s:2:"Ê";s:2:"ë";s:2:"Ë";s:2:"ì";s:2:"Ì";s:2:"í";s:2:"Í";s:2:"î";s:2:"Î";s:2:"ï";s:2:"Ï";s:2:"ð";s:2:"Ð";s:2:"ñ";s:2:"Ñ";s:2:"ò";s:2:"Ò";s:2:"ó";s:2:"Ó";s:2:"ô";s:2:"Ô";s:2:"õ";s:2:"Õ";s:2:"ö";s:2:"Ö";s:2:"ø";s:2:"Ø";s:2:"ù";s:2:"Ù";s:2:"ú";s:2:"Ú";s:2:"û";s:2:"Û";s:2:"ü";s:2:"Ü";s:2:"ý";s:2:"Ý";s:2:"þ";s:2:"Þ";s:2:"ÿ";s:2:"Ÿ";s:2:"ā";s:2:"Ā";s:2:"ă";s:2:"Ă";s:2:"ą";s:2:"Ą";s:2:"ć";s:2:"Ć";s:2:"ĉ";s:2:"Ĉ";s:2:"ċ";s:2:"Ċ";s:2:"č";s:2:"Č";s:2:"ď";s:2:"Ď";s:2:"đ";s:2:"Đ";s:2:"ē";s:2:"Ē";s:2:"ĕ";s:2:"Ĕ";s:2:"ė";s:2:"Ė";s:2:"ę";s:2:"Ę";s:2:"ě";s:2:"Ě";s:2:"ĝ";s:2:"Ĝ";s:2:"ğ";s:2:"Ğ";s:2:"ġ";s:2:"Ġ";s:2:"ģ";s:2:"Ģ";s:2:"ĥ";s:2:"Ĥ";s:2:"ħ";s:2:"Ħ";s:2:"ĩ";s:2:"Ĩ";s:2:"ī";s:2:"Ī";s:2:"ĭ";s:2:"Ĭ";s:2:"į";s:2:"Į";s:2:"ı";s:1:"I";s:2:"ij";s:2:"IJ";s:2:"ĵ";s:2:"Ĵ";s:2:"ķ";s:2:"Ķ";s:2:"ĺ";s:2:"Ĺ";s:2:"ļ";s:2:"Ļ";s:2:"ľ";s:2:"Ľ";s:2:"ŀ";s:2:"Ŀ";s:2:"ł";s:2:"Ł";s:2:"ń";s:2:"Ń";s:2:"ņ";s:2:"Ņ";s:2:"ň";s:2:"Ň";s:2:"ŋ";s:2:"Ŋ";s:2:"ō";s:2:"Ō";s:2:"ŏ";s:2:"Ŏ";s:2:"ő";s:2:"Ő";s:2:"œ";s:2:"Œ";s:2:"ŕ";s:2:"Ŕ";s:2:"ŗ";s:2:"Ŗ";s:2:"ř";s:2:"Ř";s:2:"ś";s:2:"Ś";s:2:"ŝ";s:2:"Ŝ";s:2:"ş";s:2:"Ş";s:2:"š";s:2:"Š";s:2:"ţ";s:2:"Ţ";s:2:"ť";s:2:"Ť";s:2:"ŧ";s:2:"Ŧ";s:2:"ũ";s:2:"Ũ";s:2:"ū";s:2:"Ū";s:2:"ŭ";s:2:"Ŭ";s:2:"ů";s:2:"Ů";s:2:"ű";s:2:"Ű";s:2:"ų";s:2:"Ų";s:2:"ŵ";s:2:"Ŵ";s:2:"ŷ";s:2:"Ŷ";s:2:"ź";s:2:"Ź";s:2:"ż";s:2:"Ż";s:2:"ž";s:2:"Ž";s:2:"ſ";s:1:"S";s:2:"ƀ";s:2:"Ƀ";s:2:"ƃ";s:2:"Ƃ";s:2:"ƅ";s:2:"Ƅ";s:2:"ƈ";s:2:"Ƈ";s:2:"ƌ";s:2:"Ƌ";s:2:"ƒ";s:2:"Ƒ";s:2:"ƕ";s:2:"Ƕ";s:2:"ƙ";s:2:"Ƙ";s:2:"ƚ";s:2:"Ƚ";s:2:"ƞ";s:2:"Ƞ";s:2:"ơ";s:2:"Ơ";s:2:"ƣ";s:2:"Ƣ";s:2:"ƥ";s:2:"Ƥ";s:2:"ƨ";s:2:"Ƨ";s:2:"ƭ";s:2:"Ƭ";s:2:"ư";s:2:"Ư";s:2:"ƴ";s:2:"Ƴ";s:2:"ƶ";s:2:"Ƶ";s:2:"ƹ";s:2:"Ƹ";s:2:"ƽ";s:2:"Ƽ";s:2:"ƿ";s:2:"Ƿ";s:2:"Dž";s:2:"DŽ";s:2:"dž";s:2:"DŽ";s:2:"Lj";s:2:"LJ";s:2:"lj";s:2:"LJ";s:2:"Nj";s:2:"NJ";s:2:"nj";s:2:"NJ";s:2:"ǎ";s:2:"Ǎ";s:2:"ǐ";s:2:"Ǐ";s:2:"ǒ";s:2:"Ǒ";s:2:"ǔ";s:2:"Ǔ";s:2:"ǖ";s:2:"Ǖ";s:2:"ǘ";s:2:"Ǘ";s:2:"ǚ";s:2:"Ǚ";s:2:"ǜ";s:2:"Ǜ";s:2:"ǝ";s:2:"Ǝ";s:2:"ǟ";s:2:"Ǟ";s:2:"ǡ";s:2:"Ǡ";s:2:"ǣ";s:2:"Ǣ";s:2:"ǥ";s:2:"Ǥ";s:2:"ǧ";s:2:"Ǧ";s:2:"ǩ";s:2:"Ǩ";s:2:"ǫ";s:2:"Ǫ";s:2:"ǭ";s:2:"Ǭ";s:2:"ǯ";s:2:"Ǯ";s:2:"Dz";s:2:"DZ";s:2:"dz";s:2:"DZ";s:2:"ǵ";s:2:"Ǵ";s:2:"ǹ";s:2:"Ǹ";s:2:"ǻ";s:2:"Ǻ";s:2:"ǽ";s:2:"Ǽ";s:2:"ǿ";s:2:"Ǿ";s:2:"ȁ";s:2:"Ȁ";s:2:"ȃ";s:2:"Ȃ";s:2:"ȅ";s:2:"Ȅ";s:2:"ȇ";s:2:"Ȇ";s:2:"ȉ";s:2:"Ȉ";s:2:"ȋ";s:2:"Ȋ";s:2:"ȍ";s:2:"Ȍ";s:2:"ȏ";s:2:"Ȏ";s:2:"ȑ";s:2:"Ȑ";s:2:"ȓ";s:2:"Ȓ";s:2:"ȕ";s:2:"Ȕ";s:2:"ȗ";s:2:"Ȗ";s:2:"ș";s:2:"Ș";s:2:"ț";s:2:"Ț";s:2:"ȝ";s:2:"Ȝ";s:2:"ȟ";s:2:"Ȟ";s:2:"ȣ";s:2:"Ȣ";s:2:"ȥ";s:2:"Ȥ";s:2:"ȧ";s:2:"Ȧ";s:2:"ȩ";s:2:"Ȩ";s:2:"ȫ";s:2:"Ȫ";s:2:"ȭ";s:2:"Ȭ";s:2:"ȯ";s:2:"Ȯ";s:2:"ȱ";s:2:"Ȱ";s:2:"ȳ";s:2:"Ȳ";s:2:"ȼ";s:2:"Ȼ";s:2:"ȿ";s:3:"Ȿ";s:2:"ɀ";s:3:"Ɀ";s:2:"ɂ";s:2:"Ɂ";s:2:"ɇ";s:2:"Ɇ";s:2:"ɉ";s:2:"Ɉ";s:2:"ɋ";s:2:"Ɋ";s:2:"ɍ";s:2:"Ɍ";s:2:"ɏ";s:2:"Ɏ";s:2:"ɐ";s:3:"Ɐ";s:2:"ɑ";s:3:"Ɑ";s:2:"ɒ";s:3:"Ɒ";s:2:"ɓ";s:2:"Ɓ";s:2:"ɔ";s:2:"Ɔ";s:2:"ɖ";s:2:"Ɖ";s:2:"ɗ";s:2:"Ɗ";s:2:"ə";s:2:"Ə";s:2:"ɛ";s:2:"Ɛ";s:2:"ɜ";s:3:"Ɜ";s:2:"ɠ";s:2:"Ɠ";s:2:"ɡ";s:3:"Ɡ";s:2:"ɣ";s:2:"Ɣ";s:2:"ɥ";s:3:"Ɥ";s:2:"ɦ";s:3:"Ɦ";s:2:"ɨ";s:2:"Ɨ";s:2:"ɩ";s:2:"Ɩ";s:2:"ɫ";s:3:"Ɫ";s:2:"ɬ";s:3:"Ɬ";s:2:"ɯ";s:2:"Ɯ";s:2:"ɱ";s:3:"Ɱ";s:2:"ɲ";s:2:"Ɲ";s:2:"ɵ";s:2:"Ɵ";s:2:"ɽ";s:3:"Ɽ";s:2:"ʀ";s:2:"Ʀ";s:2:"ʃ";s:2:"Ʃ";s:2:"ʇ";s:3:"Ʇ";s:2:"ʈ";s:2:"Ʈ";s:2:"ʉ";s:2:"Ʉ";s:2:"ʊ";s:2:"Ʊ";s:2:"ʋ";s:2:"Ʋ";s:2:"ʌ";s:2:"Ʌ";s:2:"ʒ";s:2:"Ʒ";s:2:"ʞ";s:3:"Ʞ";s:2:"ͅ";s:2:"Ι";s:2:"ͱ";s:2:"Ͱ";s:2:"ͳ";s:2:"Ͳ";s:2:"ͷ";s:2:"Ͷ";s:2:"ͻ";s:2:"Ͻ";s:2:"ͼ";s:2:"Ͼ";s:2:"ͽ";s:2:"Ͽ";s:2:"ά";s:2:"Ά";s:2:"έ";s:2:"Έ";s:2:"ή";s:2:"Ή";s:2:"ί";s:2:"Ί";s:2:"α";s:2:"Α";s:2:"β";s:2:"Β";s:2:"γ";s:2:"Γ";s:2:"δ";s:2:"Δ";s:2:"ε";s:2:"Ε";s:2:"ζ";s:2:"Ζ";s:2:"η";s:2:"Η";s:2:"θ";s:2:"Θ";s:2:"ι";s:2:"Ι";s:2:"κ";s:2:"Κ";s:2:"λ";s:2:"Λ";s:2:"μ";s:2:"Μ";s:2:"ν";s:2:"Ν";s:2:"ξ";s:2:"Ξ";s:2:"ο";s:2:"Ο";s:2:"π";s:2:"Π";s:2:"ρ";s:2:"Ρ";s:2:"ς";s:2:"Σ";s:2:"σ";s:2:"Σ";s:2:"τ";s:2:"Τ";s:2:"υ";s:2:"Υ";s:2:"φ";s:2:"Φ";s:2:"χ";s:2:"Χ";s:2:"ψ";s:2:"Ψ";s:2:"ω";s:2:"Ω";s:2:"ϊ";s:2:"Ϊ";s:2:"ϋ";s:2:"Ϋ";s:2:"ό";s:2:"Ό";s:2:"ύ";s:2:"Ύ";s:2:"ώ";s:2:"Ώ";s:2:"ϐ";s:2:"Β";s:2:"ϑ";s:2:"Θ";s:2:"ϕ";s:2:"Φ";s:2:"ϖ";s:2:"Π";s:2:"ϗ";s:2:"Ϗ";s:2:"ϙ";s:2:"Ϙ";s:2:"ϛ";s:2:"Ϛ";s:2:"ϝ";s:2:"Ϝ";s:2:"ϟ";s:2:"Ϟ";s:2:"ϡ";s:2:"Ϡ";s:2:"ϣ";s:2:"Ϣ";s:2:"ϥ";s:2:"Ϥ";s:2:"ϧ";s:2:"Ϧ";s:2:"ϩ";s:2:"Ϩ";s:2:"ϫ";s:2:"Ϫ";s:2:"ϭ";s:2:"Ϭ";s:2:"ϯ";s:2:"Ϯ";s:2:"ϰ";s:2:"Κ";s:2:"ϱ";s:2:"Ρ";s:2:"ϲ";s:2:"Ϲ";s:2:"ϳ";s:2:"Ϳ";s:2:"ϵ";s:2:"Ε";s:2:"ϸ";s:2:"Ϸ";s:2:"ϻ";s:2:"Ϻ";s:2:"а";s:2:"А";s:2:"б";s:2:"Б";s:2:"в";s:2:"В";s:2:"г";s:2:"Г";s:2:"д";s:2:"Д";s:2:"е";s:2:"Е";s:2:"ж";s:2:"Ж";s:2:"з";s:2:"З";s:2:"и";s:2:"И";s:2:"й";s:2:"Й";s:2:"к";s:2:"К";s:2:"л";s:2:"Л";s:2:"м";s:2:"М";s:2:"н";s:2:"Н";s:2:"о";s:2:"О";s:2:"п";s:2:"П";s:2:"р";s:2:"Р";s:2:"с";s:2:"С";s:2:"т";s:2:"Т";s:2:"у";s:2:"У";s:2:"ф";s:2:"Ф";s:2:"х";s:2:"Х";s:2:"ц";s:2:"Ц";s:2:"ч";s:2:"Ч";s:2:"ш";s:2:"Ш";s:2:"щ";s:2:"Щ";s:2:"ъ";s:2:"Ъ";s:2:"ы";s:2:"Ы";s:2:"ь";s:2:"Ь";s:2:"э";s:2:"Э";s:2:"ю";s:2:"Ю";s:2:"я";s:2:"Я";s:2:"ѐ";s:2:"Ѐ";s:2:"ё";s:2:"Ё";s:2:"ђ";s:2:"Ђ";s:2:"ѓ";s:2:"Ѓ";s:2:"є";s:2:"Є";s:2:"ѕ";s:2:"Ѕ";s:2:"і";s:2:"І";s:2:"ї";s:2:"Ї";s:2:"ј";s:2:"Ј";s:2:"љ";s:2:"Љ";s:2:"њ";s:2:"Њ";s:2:"ћ";s:2:"Ћ";s:2:"ќ";s:2:"Ќ";s:2:"ѝ";s:2:"Ѝ";s:2:"ў";s:2:"Ў";s:2:"џ";s:2:"Џ";s:2:"ѡ";s:2:"Ѡ";s:2:"ѣ";s:2:"Ѣ";s:2:"ѥ";s:2:"Ѥ";s:2:"ѧ";s:2:"Ѧ";s:2:"ѩ";s:2:"Ѩ";s:2:"ѫ";s:2:"Ѫ";s:2:"ѭ";s:2:"Ѭ";s:2:"ѯ";s:2:"Ѯ";s:2:"ѱ";s:2:"Ѱ";s:2:"ѳ";s:2:"Ѳ";s:2:"ѵ";s:2:"Ѵ";s:2:"ѷ";s:2:"Ѷ";s:2:"ѹ";s:2:"Ѹ";s:2:"ѻ";s:2:"Ѻ";s:2:"ѽ";s:2:"Ѽ";s:2:"ѿ";s:2:"Ѿ";s:2:"ҁ";s:2:"Ҁ";s:2:"ҋ";s:2:"Ҋ";s:2:"ҍ";s:2:"Ҍ";s:2:"ҏ";s:2:"Ҏ";s:2:"ґ";s:2:"Ґ";s:2:"ғ";s:2:"Ғ";s:2:"ҕ";s:2:"Ҕ";s:2:"җ";s:2:"Җ";s:2:"ҙ";s:2:"Ҙ";s:2:"қ";s:2:"Қ";s:2:"ҝ";s:2:"Ҝ";s:2:"ҟ";s:2:"Ҟ";s:2:"ҡ";s:2:"Ҡ";s:2:"ң";s:2:"Ң";s:2:"ҥ";s:2:"Ҥ";s:2:"ҧ";s:2:"Ҧ";s:2:"ҩ";s:2:"Ҩ";s:2:"ҫ";s:2:"Ҫ";s:2:"ҭ";s:2:"Ҭ";s:2:"ү";s:2:"Ү";s:2:"ұ";s:2:"Ұ";s:2:"ҳ";s:2:"Ҳ";s:2:"ҵ";s:2:"Ҵ";s:2:"ҷ";s:2:"Ҷ";s:2:"ҹ";s:2:"Ҹ";s:2:"һ";s:2:"Һ";s:2:"ҽ";s:2:"Ҽ";s:2:"ҿ";s:2:"Ҿ";s:2:"ӂ";s:2:"Ӂ";s:2:"ӄ";s:2:"Ӄ";s:2:"ӆ";s:2:"Ӆ";s:2:"ӈ";s:2:"Ӈ";s:2:"ӊ";s:2:"Ӊ";s:2:"ӌ";s:2:"Ӌ";s:2:"ӎ";s:2:"Ӎ";s:2:"ӏ";s:2:"Ӏ";s:2:"ӑ";s:2:"Ӑ";s:2:"ӓ";s:2:"Ӓ";s:2:"ӕ";s:2:"Ӕ";s:2:"ӗ";s:2:"Ӗ";s:2:"ә";s:2:"Ә";s:2:"ӛ";s:2:"Ӛ";s:2:"ӝ";s:2:"Ӝ";s:2:"ӟ";s:2:"Ӟ";s:2:"ӡ";s:2:"Ӡ";s:2:"ӣ";s:2:"Ӣ";s:2:"ӥ";s:2:"Ӥ";s:2:"ӧ";s:2:"Ӧ";s:2:"ө";s:2:"Ө";s:2:"ӫ";s:2:"Ӫ";s:2:"ӭ";s:2:"Ӭ";s:2:"ӯ";s:2:"Ӯ";s:2:"ӱ";s:2:"Ӱ";s:2:"ӳ";s:2:"Ӳ";s:2:"ӵ";s:2:"Ӵ";s:2:"ӷ";s:2:"Ӷ";s:2:"ӹ";s:2:"Ӹ";s:2:"ӻ";s:2:"Ӻ";s:2:"ӽ";s:2:"Ӽ";s:2:"ӿ";s:2:"Ӿ";s:2:"ԁ";s:2:"Ԁ";s:2:"ԃ";s:2:"Ԃ";s:2:"ԅ";s:2:"Ԅ";s:2:"ԇ";s:2:"Ԇ";s:2:"ԉ";s:2:"Ԉ";s:2:"ԋ";s:2:"Ԋ";s:2:"ԍ";s:2:"Ԍ";s:2:"ԏ";s:2:"Ԏ";s:2:"ԑ";s:2:"Ԑ";s:2:"ԓ";s:2:"Ԓ";s:2:"ԕ";s:2:"Ԕ";s:2:"ԗ";s:2:"Ԗ";s:2:"ԙ";s:2:"Ԙ";s:2:"ԛ";s:2:"Ԛ";s:2:"ԝ";s:2:"Ԝ";s:2:"ԟ";s:2:"Ԟ";s:2:"ԡ";s:2:"Ԡ";s:2:"ԣ";s:2:"Ԣ";s:2:"ԥ";s:2:"Ԥ";s:2:"ԧ";s:2:"Ԧ";s:2:"ԩ";s:2:"Ԩ";s:2:"ԫ";s:2:"Ԫ";s:2:"ԭ";s:2:"Ԭ";s:2:"ԯ";s:2:"Ԯ";s:2:"ա";s:2:"Ա";s:2:"բ";s:2:"Բ";s:2:"գ";s:2:"Գ";s:2:"դ";s:2:"Դ";s:2:"ե";s:2:"Ե";s:2:"զ";s:2:"Զ";s:2:"է";s:2:"Է";s:2:"ը";s:2:"Ը";s:2:"թ";s:2:"Թ";s:2:"ժ";s:2:"Ժ";s:2:"ի";s:2:"Ի";s:2:"լ";s:2:"Լ";s:2:"խ";s:2:"Խ";s:2:"ծ";s:2:"Ծ";s:2:"կ";s:2:"Կ";s:2:"հ";s:2:"Հ";s:2:"ձ";s:2:"Ձ";s:2:"ղ";s:2:"Ղ";s:2:"ճ";s:2:"Ճ";s:2:"մ";s:2:"Մ";s:2:"յ";s:2:"Յ";s:2:"ն";s:2:"Ն";s:2:"շ";s:2:"Շ";s:2:"ո";s:2:"Ո";s:2:"չ";s:2:"Չ";s:2:"պ";s:2:"Պ";s:2:"ջ";s:2:"Ջ";s:2:"ռ";s:2:"Ռ";s:2:"ս";s:2:"Ս";s:2:"վ";s:2:"Վ";s:2:"տ";s:2:"Տ";s:2:"ր";s:2:"Ր";s:2:"ց";s:2:"Ց";s:2:"ւ";s:2:"Ւ";s:2:"փ";s:2:"Փ";s:2:"ք";s:2:"Ք";s:2:"օ";s:2:"Օ";s:2:"ֆ";s:2:"Ֆ";s:3:"ᵹ";s:3:"Ᵹ";s:3:"ᵽ";s:3:"Ᵽ";s:3:"ḁ";s:3:"Ḁ";s:3:"ḃ";s:3:"Ḃ";s:3:"ḅ";s:3:"Ḅ";s:3:"ḇ";s:3:"Ḇ";s:3:"ḉ";s:3:"Ḉ";s:3:"ḋ";s:3:"Ḋ";s:3:"ḍ";s:3:"Ḍ";s:3:"ḏ";s:3:"Ḏ";s:3:"ḑ";s:3:"Ḑ";s:3:"ḓ";s:3:"Ḓ";s:3:"ḕ";s:3:"Ḕ";s:3:"ḗ";s:3:"Ḗ";s:3:"ḙ";s:3:"Ḙ";s:3:"ḛ";s:3:"Ḛ";s:3:"ḝ";s:3:"Ḝ";s:3:"ḟ";s:3:"Ḟ";s:3:"ḡ";s:3:"Ḡ";s:3:"ḣ";s:3:"Ḣ";s:3:"ḥ";s:3:"Ḥ";s:3:"ḧ";s:3:"Ḧ";s:3:"ḩ";s:3:"Ḩ";s:3:"ḫ";s:3:"Ḫ";s:3:"ḭ";s:3:"Ḭ";s:3:"ḯ";s:3:"Ḯ";s:3:"ḱ";s:3:"Ḱ";s:3:"ḳ";s:3:"Ḳ";s:3:"ḵ";s:3:"Ḵ";s:3:"ḷ";s:3:"Ḷ";s:3:"ḹ";s:3:"Ḹ";s:3:"ḻ";s:3:"Ḻ";s:3:"ḽ";s:3:"Ḽ";s:3:"ḿ";s:3:"Ḿ";s:3:"ṁ";s:3:"Ṁ";s:3:"ṃ";s:3:"Ṃ";s:3:"ṅ";s:3:"Ṅ";s:3:"ṇ";s:3:"Ṇ";s:3:"ṉ";s:3:"Ṉ";s:3:"ṋ";s:3:"Ṋ";s:3:"ṍ";s:3:"Ṍ";s:3:"ṏ";s:3:"Ṏ";s:3:"ṑ";s:3:"Ṑ";s:3:"ṓ";s:3:"Ṓ";s:3:"ṕ";s:3:"Ṕ";s:3:"ṗ";s:3:"Ṗ";s:3:"ṙ";s:3:"Ṙ";s:3:"ṛ";s:3:"Ṛ";s:3:"ṝ";s:3:"Ṝ";s:3:"ṟ";s:3:"Ṟ";s:3:"ṡ";s:3:"Ṡ";s:3:"ṣ";s:3:"Ṣ";s:3:"ṥ";s:3:"Ṥ";s:3:"ṧ";s:3:"Ṧ";s:3:"ṩ";s:3:"Ṩ";s:3:"ṫ";s:3:"Ṫ";s:3:"ṭ";s:3:"Ṭ";s:3:"ṯ";s:3:"Ṯ";s:3:"ṱ";s:3:"Ṱ";s:3:"ṳ";s:3:"Ṳ";s:3:"ṵ";s:3:"Ṵ";s:3:"ṷ";s:3:"Ṷ";s:3:"ṹ";s:3:"Ṹ";s:3:"ṻ";s:3:"Ṻ";s:3:"ṽ";s:3:"Ṽ";s:3:"ṿ";s:3:"Ṿ";s:3:"ẁ";s:3:"Ẁ";s:3:"ẃ";s:3:"Ẃ";s:3:"ẅ";s:3:"Ẅ";s:3:"ẇ";s:3:"Ẇ";s:3:"ẉ";s:3:"Ẉ";s:3:"ẋ";s:3:"Ẋ";s:3:"ẍ";s:3:"Ẍ";s:3:"ẏ";s:3:"Ẏ";s:3:"ẑ";s:3:"Ẑ";s:3:"ẓ";s:3:"Ẓ";s:3:"ẕ";s:3:"Ẕ";s:3:"ẛ";s:3:"Ṡ";s:3:"ạ";s:3:"Ạ";s:3:"ả";s:3:"Ả";s:3:"ấ";s:3:"Ấ";s:3:"ầ";s:3:"Ầ";s:3:"ẩ";s:3:"Ẩ";s:3:"ẫ";s:3:"Ẫ";s:3:"ậ";s:3:"Ậ";s:3:"ắ";s:3:"Ắ";s:3:"ằ";s:3:"Ằ";s:3:"ẳ";s:3:"Ẳ";s:3:"ẵ";s:3:"Ẵ";s:3:"ặ";s:3:"Ặ";s:3:"ẹ";s:3:"Ẹ";s:3:"ẻ";s:3:"Ẻ";s:3:"ẽ";s:3:"Ẽ";s:3:"ế";s:3:"Ế";s:3:"ề";s:3:"Ề";s:3:"ể";s:3:"Ể";s:3:"ễ";s:3:"Ễ";s:3:"ệ";s:3:"Ệ";s:3:"ỉ";s:3:"Ỉ";s:3:"ị";s:3:"Ị";s:3:"ọ";s:3:"Ọ";s:3:"ỏ";s:3:"Ỏ";s:3:"ố";s:3:"Ố";s:3:"ồ";s:3:"Ồ";s:3:"ổ";s:3:"Ổ";s:3:"ỗ";s:3:"Ỗ";s:3:"ộ";s:3:"Ộ";s:3:"ớ";s:3:"Ớ";s:3:"ờ";s:3:"Ờ";s:3:"ở";s:3:"Ở";s:3:"ỡ";s:3:"Ỡ";s:3:"ợ";s:3:"Ợ";s:3:"ụ";s:3:"Ụ";s:3:"ủ";s:3:"Ủ";s:3:"ứ";s:3:"Ứ";s:3:"ừ";s:3:"Ừ";s:3:"ử";s:3:"Ử";s:3:"ữ";s:3:"Ữ";s:3:"ự";s:3:"Ự";s:3:"ỳ";s:3:"Ỳ";s:3:"ỵ";s:3:"Ỵ";s:3:"ỷ";s:3:"Ỷ";s:3:"ỹ";s:3:"Ỹ";s:3:"ỻ";s:3:"Ỻ";s:3:"ỽ";s:3:"Ỽ";s:3:"ỿ";s:3:"Ỿ";s:3:"ἀ";s:3:"Ἀ";s:3:"ἁ";s:3:"Ἁ";s:3:"ἂ";s:3:"Ἂ";s:3:"ἃ";s:3:"Ἃ";s:3:"ἄ";s:3:"Ἄ";s:3:"ἅ";s:3:"Ἅ";s:3:"ἆ";s:3:"Ἆ";s:3:"ἇ";s:3:"Ἇ";s:3:"ἐ";s:3:"Ἐ";s:3:"ἑ";s:3:"Ἑ";s:3:"ἒ";s:3:"Ἒ";s:3:"ἓ";s:3:"Ἓ";s:3:"ἔ";s:3:"Ἔ";s:3:"ἕ";s:3:"Ἕ";s:3:"ἠ";s:3:"Ἠ";s:3:"ἡ";s:3:"Ἡ";s:3:"ἢ";s:3:"Ἢ";s:3:"ἣ";s:3:"Ἣ";s:3:"ἤ";s:3:"Ἤ";s:3:"ἥ";s:3:"Ἥ";s:3:"ἦ";s:3:"Ἦ";s:3:"ἧ";s:3:"Ἧ";s:3:"ἰ";s:3:"Ἰ";s:3:"ἱ";s:3:"Ἱ";s:3:"ἲ";s:3:"Ἲ";s:3:"ἳ";s:3:"Ἳ";s:3:"ἴ";s:3:"Ἴ";s:3:"ἵ";s:3:"Ἵ";s:3:"ἶ";s:3:"Ἶ";s:3:"ἷ";s:3:"Ἷ";s:3:"ὀ";s:3:"Ὀ";s:3:"ὁ";s:3:"Ὁ";s:3:"ὂ";s:3:"Ὂ";s:3:"ὃ";s:3:"Ὃ";s:3:"ὄ";s:3:"Ὄ";s:3:"ὅ";s:3:"Ὅ";s:3:"ὑ";s:3:"Ὑ";s:3:"ὓ";s:3:"Ὓ";s:3:"ὕ";s:3:"Ὕ";s:3:"ὗ";s:3:"Ὗ";s:3:"ὠ";s:3:"Ὠ";s:3:"ὡ";s:3:"Ὡ";s:3:"ὢ";s:3:"Ὢ";s:3:"ὣ";s:3:"Ὣ";s:3:"ὤ";s:3:"Ὤ";s:3:"ὥ";s:3:"Ὥ";s:3:"ὦ";s:3:"Ὦ";s:3:"ὧ";s:3:"Ὧ";s:3:"ὰ";s:3:"Ὰ";s:3:"ά";s:3:"Ά";s:3:"ὲ";s:3:"Ὲ";s:3:"έ";s:3:"Έ";s:3:"ὴ";s:3:"Ὴ";s:3:"ή";s:3:"Ή";s:3:"ὶ";s:3:"Ὶ";s:3:"ί";s:3:"Ί";s:3:"ὸ";s:3:"Ὸ";s:3:"ό";s:3:"Ό";s:3:"ὺ";s:3:"Ὺ";s:3:"ύ";s:3:"Ύ";s:3:"ὼ";s:3:"Ὼ";s:3:"ώ";s:3:"Ώ";s:3:"ᾀ";s:3:"ᾈ";s:3:"ᾁ";s:3:"ᾉ";s:3:"ᾂ";s:3:"ᾊ";s:3:"ᾃ";s:3:"ᾋ";s:3:"ᾄ";s:3:"ᾌ";s:3:"ᾅ";s:3:"ᾍ";s:3:"ᾆ";s:3:"ᾎ";s:3:"ᾇ";s:3:"ᾏ";s:3:"ᾐ";s:3:"ᾘ";s:3:"ᾑ";s:3:"ᾙ";s:3:"ᾒ";s:3:"ᾚ";s:3:"ᾓ";s:3:"ᾛ";s:3:"ᾔ";s:3:"ᾜ";s:3:"ᾕ";s:3:"ᾝ";s:3:"ᾖ";s:3:"ᾞ";s:3:"ᾗ";s:3:"ᾟ";s:3:"ᾠ";s:3:"ᾨ";s:3:"ᾡ";s:3:"ᾩ";s:3:"ᾢ";s:3:"ᾪ";s:3:"ᾣ";s:3:"ᾫ";s:3:"ᾤ";s:3:"ᾬ";s:3:"ᾥ";s:3:"ᾭ";s:3:"ᾦ";s:3:"ᾮ";s:3:"ᾧ";s:3:"ᾯ";s:3:"ᾰ";s:3:"Ᾰ";s:3:"ᾱ";s:3:"Ᾱ";s:3:"ᾳ";s:3:"ᾼ";s:3:"ι";s:2:"Ι";s:3:"ῃ";s:3:"ῌ";s:3:"ῐ";s:3:"Ῐ";s:3:"ῑ";s:3:"Ῑ";s:3:"ῠ";s:3:"Ῠ";s:3:"ῡ";s:3:"Ῡ";s:3:"ῥ";s:3:"Ῥ";s:3:"ῳ";s:3:"ῼ";s:3:"ⅎ";s:3:"Ⅎ";s:3:"ⅰ";s:3:"Ⅰ";s:3:"ⅱ";s:3:"Ⅱ";s:3:"ⅲ";s:3:"Ⅲ";s:3:"ⅳ";s:3:"Ⅳ";s:3:"ⅴ";s:3:"Ⅴ";s:3:"ⅵ";s:3:"Ⅵ";s:3:"ⅶ";s:3:"Ⅶ";s:3:"ⅷ";s:3:"Ⅷ";s:3:"ⅸ";s:3:"Ⅸ";s:3:"ⅹ";s:3:"Ⅹ";s:3:"ⅺ";s:3:"Ⅺ";s:3:"ⅻ";s:3:"Ⅻ";s:3:"ⅼ";s:3:"Ⅼ";s:3:"ⅽ";s:3:"Ⅽ";s:3:"ⅾ";s:3:"Ⅾ";s:3:"ⅿ";s:3:"Ⅿ";s:3:"ↄ";s:3:"Ↄ";s:3:"ⓐ";s:3:"Ⓐ";s:3:"ⓑ";s:3:"Ⓑ";s:3:"ⓒ";s:3:"Ⓒ";s:3:"ⓓ";s:3:"Ⓓ";s:3:"ⓔ";s:3:"Ⓔ";s:3:"ⓕ";s:3:"Ⓕ";s:3:"ⓖ";s:3:"Ⓖ";s:3:"ⓗ";s:3:"Ⓗ";s:3:"ⓘ";s:3:"Ⓘ";s:3:"ⓙ";s:3:"Ⓙ";s:3:"ⓚ";s:3:"Ⓚ";s:3:"ⓛ";s:3:"Ⓛ";s:3:"ⓜ";s:3:"Ⓜ";s:3:"ⓝ";s:3:"Ⓝ";s:3:"ⓞ";s:3:"Ⓞ";s:3:"ⓟ";s:3:"Ⓟ";s:3:"ⓠ";s:3:"Ⓠ";s:3:"ⓡ";s:3:"Ⓡ";s:3:"ⓢ";s:3:"Ⓢ";s:3:"ⓣ";s:3:"Ⓣ";s:3:"ⓤ";s:3:"Ⓤ";s:3:"ⓥ";s:3:"Ⓥ";s:3:"ⓦ";s:3:"Ⓦ";s:3:"ⓧ";s:3:"Ⓧ";s:3:"ⓨ";s:3:"Ⓨ";s:3:"ⓩ";s:3:"Ⓩ";s:3:"ⰰ";s:3:"Ⰰ";s:3:"ⰱ";s:3:"Ⰱ";s:3:"ⰲ";s:3:"Ⰲ";s:3:"ⰳ";s:3:"Ⰳ";s:3:"ⰴ";s:3:"Ⰴ";s:3:"ⰵ";s:3:"Ⰵ";s:3:"ⰶ";s:3:"Ⰶ";s:3:"ⰷ";s:3:"Ⰷ";s:3:"ⰸ";s:3:"Ⰸ";s:3:"ⰹ";s:3:"Ⰹ";s:3:"ⰺ";s:3:"Ⰺ";s:3:"ⰻ";s:3:"Ⰻ";s:3:"ⰼ";s:3:"Ⰼ";s:3:"ⰽ";s:3:"Ⰽ";s:3:"ⰾ";s:3:"Ⰾ";s:3:"ⰿ";s:3:"Ⰿ";s:3:"ⱀ";s:3:"Ⱀ";s:3:"ⱁ";s:3:"Ⱁ";s:3:"ⱂ";s:3:"Ⱂ";s:3:"ⱃ";s:3:"Ⱃ";s:3:"ⱄ";s:3:"Ⱄ";s:3:"ⱅ";s:3:"Ⱅ";s:3:"ⱆ";s:3:"Ⱆ";s:3:"ⱇ";s:3:"Ⱇ";s:3:"ⱈ";s:3:"Ⱈ";s:3:"ⱉ";s:3:"Ⱉ";s:3:"ⱊ";s:3:"Ⱊ";s:3:"ⱋ";s:3:"Ⱋ";s:3:"ⱌ";s:3:"Ⱌ";s:3:"ⱍ";s:3:"Ⱍ";s:3:"ⱎ";s:3:"Ⱎ";s:3:"ⱏ";s:3:"Ⱏ";s:3:"ⱐ";s:3:"Ⱐ";s:3:"ⱑ";s:3:"Ⱑ";s:3:"ⱒ";s:3:"Ⱒ";s:3:"ⱓ";s:3:"Ⱓ";s:3:"ⱔ";s:3:"Ⱔ";s:3:"ⱕ";s:3:"Ⱕ";s:3:"ⱖ";s:3:"Ⱖ";s:3:"ⱗ";s:3:"Ⱗ";s:3:"ⱘ";s:3:"Ⱘ";s:3:"ⱙ";s:3:"Ⱙ";s:3:"ⱚ";s:3:"Ⱚ";s:3:"ⱛ";s:3:"Ⱛ";s:3:"ⱜ";s:3:"Ⱜ";s:3:"ⱝ";s:3:"Ⱝ";s:3:"ⱞ";s:3:"Ⱞ";s:3:"ⱡ";s:3:"Ⱡ";s:3:"ⱥ";s:2:"Ⱥ";s:3:"ⱦ";s:2:"Ⱦ";s:3:"ⱨ";s:3:"Ⱨ";s:3:"ⱪ";s:3:"Ⱪ";s:3:"ⱬ";s:3:"Ⱬ";s:3:"ⱳ";s:3:"Ⱳ";s:3:"ⱶ";s:3:"Ⱶ";s:3:"ⲁ";s:3:"Ⲁ";s:3:"ⲃ";s:3:"Ⲃ";s:3:"ⲅ";s:3:"Ⲅ";s:3:"ⲇ";s:3:"Ⲇ";s:3:"ⲉ";s:3:"Ⲉ";s:3:"ⲋ";s:3:"Ⲋ";s:3:"ⲍ";s:3:"Ⲍ";s:3:"ⲏ";s:3:"Ⲏ";s:3:"ⲑ";s:3:"Ⲑ";s:3:"ⲓ";s:3:"Ⲓ";s:3:"ⲕ";s:3:"Ⲕ";s:3:"ⲗ";s:3:"Ⲗ";s:3:"ⲙ";s:3:"Ⲙ";s:3:"ⲛ";s:3:"Ⲛ";s:3:"ⲝ";s:3:"Ⲝ";s:3:"ⲟ";s:3:"Ⲟ";s:3:"ⲡ";s:3:"Ⲡ";s:3:"ⲣ";s:3:"Ⲣ";s:3:"ⲥ";s:3:"Ⲥ";s:3:"ⲧ";s:3:"Ⲧ";s:3:"ⲩ";s:3:"Ⲩ";s:3:"ⲫ";s:3:"Ⲫ";s:3:"ⲭ";s:3:"Ⲭ";s:3:"ⲯ";s:3:"Ⲯ";s:3:"ⲱ";s:3:"Ⲱ";s:3:"ⲳ";s:3:"Ⲳ";s:3:"ⲵ";s:3:"Ⲵ";s:3:"ⲷ";s:3:"Ⲷ";s:3:"ⲹ";s:3:"Ⲹ";s:3:"ⲻ";s:3:"Ⲻ";s:3:"ⲽ";s:3:"Ⲽ";s:3:"ⲿ";s:3:"Ⲿ";s:3:"ⳁ";s:3:"Ⳁ";s:3:"ⳃ";s:3:"Ⳃ";s:3:"ⳅ";s:3:"Ⳅ";s:3:"ⳇ";s:3:"Ⳇ";s:3:"ⳉ";s:3:"Ⳉ";s:3:"ⳋ";s:3:"Ⳋ";s:3:"ⳍ";s:3:"Ⳍ";s:3:"ⳏ";s:3:"Ⳏ";s:3:"ⳑ";s:3:"Ⳑ";s:3:"ⳓ";s:3:"Ⳓ";s:3:"ⳕ";s:3:"Ⳕ";s:3:"ⳗ";s:3:"Ⳗ";s:3:"ⳙ";s:3:"Ⳙ";s:3:"ⳛ";s:3:"Ⳛ";s:3:"ⳝ";s:3:"Ⳝ";s:3:"ⳟ";s:3:"Ⳟ";s:3:"ⳡ";s:3:"Ⳡ";s:3:"ⳣ";s:3:"Ⳣ";s:3:"ⳬ";s:3:"Ⳬ";s:3:"ⳮ";s:3:"Ⳮ";s:3:"ⳳ";s:3:"Ⳳ";s:3:"ⴀ";s:3:"Ⴀ";s:3:"ⴁ";s:3:"Ⴁ";s:3:"ⴂ";s:3:"Ⴂ";s:3:"ⴃ";s:3:"Ⴃ";s:3:"ⴄ";s:3:"Ⴄ";s:3:"ⴅ";s:3:"Ⴅ";s:3:"ⴆ";s:3:"Ⴆ";s:3:"ⴇ";s:3:"Ⴇ";s:3:"ⴈ";s:3:"Ⴈ";s:3:"ⴉ";s:3:"Ⴉ";s:3:"ⴊ";s:3:"Ⴊ";s:3:"ⴋ";s:3:"Ⴋ";s:3:"ⴌ";s:3:"Ⴌ";s:3:"ⴍ";s:3:"Ⴍ";s:3:"ⴎ";s:3:"Ⴎ";s:3:"ⴏ";s:3:"Ⴏ";s:3:"ⴐ";s:3:"Ⴐ";s:3:"ⴑ";s:3:"Ⴑ";s:3:"ⴒ";s:3:"Ⴒ";s:3:"ⴓ";s:3:"Ⴓ";s:3:"ⴔ";s:3:"Ⴔ";s:3:"ⴕ";s:3:"Ⴕ";s:3:"ⴖ";s:3:"Ⴖ";s:3:"ⴗ";s:3:"Ⴗ";s:3:"ⴘ";s:3:"Ⴘ";s:3:"ⴙ";s:3:"Ⴙ";s:3:"ⴚ";s:3:"Ⴚ";s:3:"ⴛ";s:3:"Ⴛ";s:3:"ⴜ";s:3:"Ⴜ";s:3:"ⴝ";s:3:"Ⴝ";s:3:"ⴞ";s:3:"Ⴞ";s:3:"ⴟ";s:3:"Ⴟ";s:3:"ⴠ";s:3:"Ⴠ";s:3:"ⴡ";s:3:"Ⴡ";s:3:"ⴢ";s:3:"Ⴢ";s:3:"ⴣ";s:3:"Ⴣ";s:3:"ⴤ";s:3:"Ⴤ";s:3:"ⴥ";s:3:"Ⴥ";s:3:"ⴧ";s:3:"Ⴧ";s:3:"ⴭ";s:3:"Ⴭ";s:3:"ꙁ";s:3:"Ꙁ";s:3:"ꙃ";s:3:"Ꙃ";s:3:"ꙅ";s:3:"Ꙅ";s:3:"ꙇ";s:3:"Ꙇ";s:3:"ꙉ";s:3:"Ꙉ";s:3:"ꙋ";s:3:"Ꙋ";s:3:"ꙍ";s:3:"Ꙍ";s:3:"ꙏ";s:3:"Ꙏ";s:3:"ꙑ";s:3:"Ꙑ";s:3:"ꙓ";s:3:"Ꙓ";s:3:"ꙕ";s:3:"Ꙕ";s:3:"ꙗ";s:3:"Ꙗ";s:3:"ꙙ";s:3:"Ꙙ";s:3:"ꙛ";s:3:"Ꙛ";s:3:"ꙝ";s:3:"Ꙝ";s:3:"ꙟ";s:3:"Ꙟ";s:3:"ꙡ";s:3:"Ꙡ";s:3:"ꙣ";s:3:"Ꙣ";s:3:"ꙥ";s:3:"Ꙥ";s:3:"ꙧ";s:3:"Ꙧ";s:3:"ꙩ";s:3:"Ꙩ";s:3:"ꙫ";s:3:"Ꙫ";s:3:"ꙭ";s:3:"Ꙭ";s:3:"ꚁ";s:3:"Ꚁ";s:3:"ꚃ";s:3:"Ꚃ";s:3:"ꚅ";s:3:"Ꚅ";s:3:"ꚇ";s:3:"Ꚇ";s:3:"ꚉ";s:3:"Ꚉ";s:3:"ꚋ";s:3:"Ꚋ";s:3:"ꚍ";s:3:"Ꚍ";s:3:"ꚏ";s:3:"Ꚏ";s:3:"ꚑ";s:3:"Ꚑ";s:3:"ꚓ";s:3:"Ꚓ";s:3:"ꚕ";s:3:"Ꚕ";s:3:"ꚗ";s:3:"Ꚗ";s:3:"ꚙ";s:3:"Ꚙ";s:3:"ꚛ";s:3:"Ꚛ";s:3:"ꜣ";s:3:"Ꜣ";s:3:"ꜥ";s:3:"Ꜥ";s:3:"ꜧ";s:3:"Ꜧ";s:3:"ꜩ";s:3:"Ꜩ";s:3:"ꜫ";s:3:"Ꜫ";s:3:"ꜭ";s:3:"Ꜭ";s:3:"ꜯ";s:3:"Ꜯ";s:3:"ꜳ";s:3:"Ꜳ";s:3:"ꜵ";s:3:"Ꜵ";s:3:"ꜷ";s:3:"Ꜷ";s:3:"ꜹ";s:3:"Ꜹ";s:3:"ꜻ";s:3:"Ꜻ";s:3:"ꜽ";s:3:"Ꜽ";s:3:"ꜿ";s:3:"Ꜿ";s:3:"ꝁ";s:3:"Ꝁ";s:3:"ꝃ";s:3:"Ꝃ";s:3:"ꝅ";s:3:"Ꝅ";s:3:"ꝇ";s:3:"Ꝇ";s:3:"ꝉ";s:3:"Ꝉ";s:3:"ꝋ";s:3:"Ꝋ";s:3:"ꝍ";s:3:"Ꝍ";s:3:"ꝏ";s:3:"Ꝏ";s:3:"ꝑ";s:3:"Ꝑ";s:3:"ꝓ";s:3:"Ꝓ";s:3:"ꝕ";s:3:"Ꝕ";s:3:"ꝗ";s:3:"Ꝗ";s:3:"ꝙ";s:3:"Ꝙ";s:3:"ꝛ";s:3:"Ꝛ";s:3:"ꝝ";s:3:"Ꝝ";s:3:"ꝟ";s:3:"Ꝟ";s:3:"ꝡ";s:3:"Ꝡ";s:3:"ꝣ";s:3:"Ꝣ";s:3:"ꝥ";s:3:"Ꝥ";s:3:"ꝧ";s:3:"Ꝧ";s:3:"ꝩ";s:3:"Ꝩ";s:3:"ꝫ";s:3:"Ꝫ";s:3:"ꝭ";s:3:"Ꝭ";s:3:"ꝯ";s:3:"Ꝯ";s:3:"ꝺ";s:3:"Ꝺ";s:3:"ꝼ";s:3:"Ꝼ";s:3:"ꝿ";s:3:"Ꝿ";s:3:"ꞁ";s:3:"Ꞁ";s:3:"ꞃ";s:3:"Ꞃ";s:3:"ꞅ";s:3:"Ꞅ";s:3:"ꞇ";s:3:"Ꞇ";s:3:"ꞌ";s:3:"Ꞌ";s:3:"ꞑ";s:3:"Ꞑ";s:3:"ꞓ";s:3:"Ꞓ";s:3:"ꞗ";s:3:"Ꞗ";s:3:"ꞙ";s:3:"Ꞙ";s:3:"ꞛ";s:3:"Ꞛ";s:3:"ꞝ";s:3:"Ꞝ";s:3:"ꞟ";s:3:"Ꞟ";s:3:"ꞡ";s:3:"Ꞡ";s:3:"ꞣ";s:3:"Ꞣ";s:3:"ꞥ";s:3:"Ꞥ";s:3:"ꞧ";s:3:"Ꞧ";s:3:"ꞩ";s:3:"Ꞩ";s:3:"ａ";s:3:"Ａ";s:3:"ｂ";s:3:"Ｂ";s:3:"ｃ";s:3:"Ｃ";s:3:"ｄ";s:3:"Ｄ";s:3:"ｅ";s:3:"Ｅ";s:3:"ｆ";s:3:"Ｆ";s:3:"ｇ";s:3:"Ｇ";s:3:"ｈ";s:3:"Ｈ";s:3:"ｉ";s:3:"Ｉ";s:3:"ｊ";s:3:"Ｊ";s:3:"ｋ";s:3:"Ｋ";s:3:"ｌ";s:3:"Ｌ";s:3:"ｍ";s:3:"Ｍ";s:3:"ｎ";s:3:"Ｎ";s:3:"ｏ";s:3:"Ｏ";s:3:"ｐ";s:3:"Ｐ";s:3:"ｑ";s:3:"Ｑ";s:3:"ｒ";s:3:"Ｒ";s:3:"ｓ";s:3:"Ｓ";s:3:"ｔ";s:3:"Ｔ";s:3:"ｕ";s:3:"Ｕ";s:3:"ｖ";s:3:"Ｖ";s:3:"ｗ";s:3:"Ｗ";s:3:"ｘ";s:3:"Ｘ";s:3:"ｙ";s:3:"Ｙ";s:3:"ｚ";s:3:"Ｚ";s:4:"𐐨";s:4:"𐐀";s:4:"𐐩";s:4:"𐐁";s:4:"𐐪";s:4:"𐐂";s:4:"𐐫";s:4:"𐐃";s:4:"𐐬";s:4:"𐐄";s:4:"𐐭";s:4:"𐐅";s:4:"𐐮";s:4:"𐐆";s:4:"𐐯";s:4:"𐐇";s:4:"𐐰";s:4:"𐐈";s:4:"𐐱";s:4:"𐐉";s:4:"𐐲";s:4:"𐐊";s:4:"𐐳";s:4:"𐐋";s:4:"𐐴";s:4:"𐐌";s:4:"𐐵";s:4:"𐐍";s:4:"𐐶";s:4:"𐐎";s:4:"𐐷";s:4:"𐐏";s:4:"𐐸";s:4:"𐐐";s:4:"𐐹";s:4:"𐐑";s:4:"𐐺";s:4:"𐐒";s:4:"𐐻";s:4:"𐐓";s:4:"𐐼";s:4:"𐐔";s:4:"𐐽";s:4:"𐐕";s:4:"𐐾";s:4:"𐐖";s:4:"𐐿";s:4:"𐐗";s:4:"𐑀";s:4:"𐐘";s:4:"𐑁";s:4:"𐐙";s:4:"𐑂";s:4:"𐐚";s:4:"𐑃";s:4:"𐐛";s:4:"𐑄";s:4:"𐐜";s:4:"𐑅";s:4:"𐐝";s:4:"𐑆";s:4:"𐐞";s:4:"𐑇";s:4:"𐐟";s:4:"𐑈";s:4:"𐐠";s:4:"𐑉";s:4:"𐐡";s:4:"𐑊";s:4:"𐐢";s:4:"𐑋";s:4:"𐐣";s:4:"𐑌";s:4:"𐐤";s:4:"𐑍";s:4:"𐐥";s:4:"𐑎";s:4:"𐐦";s:4:"𐑏";s:4:"𐐧";s:4:"𑣀";s:4:"𑢠";s:4:"𑣁";s:4:"𑢡";s:4:"𑣂";s:4:"𑢢";s:4:"𑣃";s:4:"𑢣";s:4:"𑣄";s:4:"𑢤";s:4:"𑣅";s:4:"𑢥";s:4:"𑣆";s:4:"𑢦";s:4:"𑣇";s:4:"𑢧";s:4:"𑣈";s:4:"𑢨";s:4:"𑣉";s:4:"𑢩";s:4:"𑣊";s:4:"𑢪";s:4:"𑣋";s:4:"𑢫";s:4:"𑣌";s:4:"𑢬";s:4:"𑣍";s:4:"𑢭";s:4:"𑣎";s:4:"𑢮";s:4:"𑣏";s:4:"𑢯";s:4:"𑣐";s:4:"𑢰";s:4:"𑣑";s:4:"𑢱";s:4:"𑣒";s:4:"𑢲";s:4:"𑣓";s:4:"𑢳";s:4:"𑣔";s:4:"𑢴";s:4:"𑣕";s:4:"𑢵";s:4:"𑣖";s:4:"𑢶";s:4:"𑣗";s:4:"𑢷";s:4:"𑣘";s:4:"𑢸";s:4:"𑣙";s:4:"𑢹";s:4:"𑣚";s:4:"𑢺";s:4:"𑣛";s:4:"𑢻";s:4:"𑣜";s:4:"𑢼";s:4:"𑣝";s:4:"𑢽";s:4:"𑣞";s:4:"𑢾";s:4:"𑣟";s:4:"𑢿";} \ No newline at end of file diff --git a/vendor/symfony/polyfill-mbstring/bootstrap.php b/vendor/symfony/polyfill-mbstring/bootstrap.php new file mode 100644 index 0000000..4b01b61 --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/bootstrap.php @@ -0,0 +1,51 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Polyfill\Mbstring as p; + +if (!function_exists('mb_strlen')) { + define('MB_CASE_UPPER', 0); + define('MB_CASE_LOWER', 1); + define('MB_CASE_TITLE', 2); + + function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); } + function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); } + function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); } + function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); } + function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); } + function mb_language($lang = null) { return p\Mbstring::mb_language($lang); } + function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); } + function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); } + function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); } + function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); } + function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); } + function mb_parse_str($s, &$result = array()) { parse_str($s, $result); } + function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); } + function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); } + function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); } + function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); } + function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); } + function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); } + function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); } + function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); } + function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); } + function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); } + function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); } + function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); } + function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); } + function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); } + function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); } + function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); } + function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); } + function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); } + function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); } + function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $v0, $a, $b, $c, $d, $e, $f); } +} diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json new file mode 100644 index 0000000..978ff98 --- /dev/null +++ b/vendor/symfony/polyfill-mbstring/composer.json @@ -0,0 +1,34 @@ +{ + "name": "symfony/polyfill-mbstring", + "type": "library", + "description": "Symfony polyfill for the Mbstring extension", + "keywords": ["polyfill", "shim", "compatibility", "portable", "mbstring"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=5.3.3" + }, + "autoload": { + "psr-4": { "Symfony\\Polyfill\\Mbstring\\": "" }, + "files": [ "bootstrap.php" ] + }, + "suggests": { + "ext-mbstring": "For best performance" + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + } +} diff --git a/vendor/symfony/polyfill-php54/LICENSE b/vendor/symfony/polyfill-php54/LICENSE new file mode 100644 index 0000000..ef1cde9 --- /dev/null +++ b/vendor/symfony/polyfill-php54/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2014-2015 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/vendor/symfony/polyfill-php54/Php54.php b/vendor/symfony/polyfill-php54/Php54.php new file mode 100644 index 0000000..3a7eb3a --- /dev/null +++ b/vendor/symfony/polyfill-php54/Php54.php @@ -0,0 +1,42 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Php54; + +/** + * @author Nicolas Grekas + * + * @internal + */ +final class Php54 +{ + public static function hex2bin($data) + { + $len = strlen($data); + + if (null === $len) { + return; + } + if ($len % 2) { + trigger_error('hex2bin(): Hexadecimal input string must have an even length', E_USER_WARNING); + + return false; + } + + $data = pack('H*', $data); + + if (false !== strpos($data, "\0")) { + return false; + } + + return $data; + } +} diff --git a/vendor/symfony/polyfill-php54/README.md b/vendor/symfony/polyfill-php54/README.md new file mode 100644 index 0000000..775a3ee --- /dev/null +++ b/vendor/symfony/polyfill-php54/README.md @@ -0,0 +1,17 @@ +Symfony Polyfill / Php54 +======================== + +This component provides functions unavailable in releases prior to PHP 5.4: + +- [`trait_exists`](http://php.net/trait_exists) +- [`class_uses`](http://php.net/class_uses) +- [`hex2bin`](http://php.net/hex2bin) +- [`session_register_shutdown`](http://php.net/session_register_shutdown) + +More information can be found in the +[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). + +License +======= + +This library is released under the [MIT license](LICENSE). \ No newline at end of file diff --git a/vendor/symfony/polyfill-php54/Resources/stubs/CallbackFilterIterator.php b/vendor/symfony/polyfill-php54/Resources/stubs/CallbackFilterIterator.php new file mode 100644 index 0000000..b69db3d --- /dev/null +++ b/vendor/symfony/polyfill-php54/Resources/stubs/CallbackFilterIterator.php @@ -0,0 +1,28 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +class CallbackFilterIterator extends FilterIterator +{ + private $iterator; + private $callback; + + public function __construct(Iterator $iterator, $callback) + { + $this->iterator = $iterator; + $this->callback = $callback; + parent::__construct($iterator); + } + + public function accept() + { + return call_user_func($this->callback, $this->current(), $this->key(), $this->iterator); + } +} diff --git a/vendor/symfony/polyfill-php54/Resources/stubs/RecursiveCallbackFilterIterator.php b/vendor/symfony/polyfill-php54/Resources/stubs/RecursiveCallbackFilterIterator.php new file mode 100644 index 0000000..63afd38 --- /dev/null +++ b/vendor/symfony/polyfill-php54/Resources/stubs/RecursiveCallbackFilterIterator.php @@ -0,0 +1,33 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +class RecursiveCallbackFilterIterator extends CallbackFilterIterator implements RecursiveIterator +{ + private $iterator; + private $callback; + + public function __construct(RecursiveIterator $iterator, $callback) + { + $this->iterator = $iterator; + $this->callback = $callback; + parent::__construct($iterator, $callback); + } + + public function hasChildren() + { + return $this->iterator->hasChildren(); + } + + public function getChildren() + { + return new static($this->iterator->getChildren(), $this->callback); + } +} diff --git a/vendor/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php b/vendor/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php similarity index 100% rename from vendor/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php rename to vendor/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php diff --git a/vendor/symfony/polyfill-php54/bootstrap.php b/vendor/symfony/polyfill-php54/bootstrap.php new file mode 100644 index 0000000..bb0f6b4 --- /dev/null +++ b/vendor/symfony/polyfill-php54/bootstrap.php @@ -0,0 +1,27 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Polyfill\Php54 as p; + +if (PHP_VERSION_ID < 50400) { + if (!function_exists('trait_exists')) { + function trait_exists($class, $autoload = true) { return $autoload && class_exists($class, $autoload) && false; } + } + if (!function_exists('class_uses')) { + function class_uses($class, $autoload = true) { return $autoload && class_exists($class, $autoload) && false; } + } + if (!function_exists('hex2bin')) { + function hex2bin($data) { return p\Php54::hex2bin($data); } + } + if (!function_exists('session_register_shutdown')) { + function session_register_shutdown() { register_shutdown_function('session_write_close'); } + } +} diff --git a/vendor/symfony/polyfill-php54/composer.json b/vendor/symfony/polyfill-php54/composer.json new file mode 100644 index 0000000..48709c2 --- /dev/null +++ b/vendor/symfony/polyfill-php54/composer.json @@ -0,0 +1,32 @@ +{ + "name": "symfony/polyfill-php54", + "type": "library", + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "keywords": ["polyfill", "shim", "compatibility", "portable"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=5.3.3" + }, + "autoload": { + "psr-4": { "Symfony\\Polyfill\\Php54\\": "" }, + "files": [ "bootstrap.php" ], + "classmap": [ "Resources/stubs" ] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + } +} diff --git a/vendor/symfony/polyfill-php55/LICENSE b/vendor/symfony/polyfill-php55/LICENSE new file mode 100644 index 0000000..ef1cde9 --- /dev/null +++ b/vendor/symfony/polyfill-php55/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2014-2015 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/vendor/symfony/polyfill-php55/Php55.php b/vendor/symfony/polyfill-php55/Php55.php new file mode 100644 index 0000000..396baf2 --- /dev/null +++ b/vendor/symfony/polyfill-php55/Php55.php @@ -0,0 +1,63 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Php55; + +/** + * @internal + */ +final class Php55 +{ + public static function boolval($val) + { + return (bool) $val; + } + + public static function json_last_error_msg() + { + switch (json_last_error()) { + case JSON_ERROR_NONE: return 'No error'; + case JSON_ERROR_DEPTH: return 'Maximum stack depth exceeded'; + case JSON_ERROR_STATE_MISMATCH: return 'State mismatch (invalid or malformed JSON)'; + case JSON_ERROR_CTRL_CHAR: return 'Control character error, possibly incorrectly encoded'; + case JSON_ERROR_SYNTAX: return 'Syntax error'; + case JSON_ERROR_UTF8: return 'Malformed UTF-8 characters, possibly incorrectly encoded'; + default: return 'Unknown error'; + } + } + + /** + * @author Sebastiaan Stok + */ + public static function hash_pbkdf2($algorithm, $password, $salt, $iterations, $length = 0, $rawOutput = false) + { + // Number of blocks needed to create the derived key + $blocks = ceil($length / strlen(hash($algorithm, null, true))); + $digest = ''; + + for ($i = 1; $i <= $blocks; ++$i) { + $ib = $block = hash_hmac($algorithm, $salt.pack('N', $i), $password, true); + + // Iterations + for ($j = 1; $j < $iterations; ++$j) { + $ib ^= ($block = hash_hmac($algorithm, $block, $password, true)); + } + + $digest .= $ib; + } + + if (!$rawOutput) { + $digest = bin2hex($digest); + } + + return substr($digest, 0, $length); + } +} diff --git a/vendor/symfony/polyfill-php55/Php55ArrayColumn.php b/vendor/symfony/polyfill-php55/Php55ArrayColumn.php new file mode 100644 index 0000000..a3033d8 --- /dev/null +++ b/vendor/symfony/polyfill-php55/Php55ArrayColumn.php @@ -0,0 +1,64 @@ + + * + * 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. + */ + +namespace Symfony\Polyfill\Php55; + +/** + * @internal + */ +final class Php55ArrayColumn +{ + public static function array_column(array $input, $columnKey, $indexKey = null) + { + $output = array(); + + foreach ($input as $row) { + $key = $value = null; + $keySet = $valueSet = false; + + if ($indexKey !== null && array_key_exists($indexKey, $row)) { + $keySet = true; + $key = (string) $row[$indexKey]; + } + + if ($columnKey === null) { + $valueSet = true; + $value = $row; + } elseif (is_array($row) && array_key_exists($columnKey, $row)) { + $valueSet = true; + $value = $row[$columnKey]; + } + + if ($valueSet) { + if ($keySet) { + $output[$key] = $value; + } else { + $output[] = $value; + } + } + } + + return $output; + } +} diff --git a/vendor/symfony/polyfill-php55/README.md b/vendor/symfony/polyfill-php55/README.md new file mode 100644 index 0000000..018b952 --- /dev/null +++ b/vendor/symfony/polyfill-php55/README.md @@ -0,0 +1,18 @@ +Symfony Polyfill / Php55 +======================== + +This component provides functions unavailable in releases prior to PHP 5.5: + +- [`boolval`](http://php.net/boolval) +- [`json_last_error_msg`](http://php.net/json_last_error_msg) +- [`array_column`](http://php.net/array_column) +- [`hash_pbkdf2`](http://php.net/hash_pbkdf2) +- `password_*` functions (from [ircmaxell/password_compat](https://github.com/ircmaxell/password_compat)) + +More information can be found in the +[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). + +License +======= + +This library is released under the [MIT license](LICENSE). \ No newline at end of file diff --git a/vendor/symfony/polyfill-php55/bootstrap.php b/vendor/symfony/polyfill-php55/bootstrap.php new file mode 100644 index 0000000..5e634fe --- /dev/null +++ b/vendor/symfony/polyfill-php55/bootstrap.php @@ -0,0 +1,27 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Polyfill\Php55 as p; + +if (PHP_VERSION_ID < 50500) { + if (!function_exists('boolval')) { + function boolval($val) { return p\Php55::boolval($val); } + } + if (!function_exists('json_last_error_msg')) { + function json_last_error_msg() { return p\Php55::json_last_error_msg(); } + } + if (!function_exists('array_column')) { + function array_column($array, $columnKey, $indexKey = null) { return p\Php55ArrayColumn::array_column($array, $columnKey, $indexKey); } + } + if (!function_exists('hash_pbkdf2')) { + function hash_pbkdf2($algorithm, $password, $salt, $iterations, $length = 0, $rawOutput = false) { return p\Php55::hash_pbkdf2($algorithm, $password, $salt, $iterations, $length, $rawOutput); } + } +} diff --git a/vendor/symfony/polyfill-php55/composer.json b/vendor/symfony/polyfill-php55/composer.json new file mode 100644 index 0000000..f0edb4b --- /dev/null +++ b/vendor/symfony/polyfill-php55/composer.json @@ -0,0 +1,32 @@ +{ + "name": "symfony/polyfill-php55", + "type": "library", + "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "keywords": ["polyfill", "shim", "compatibility", "portable"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=5.3.3", + "ircmaxell/password-compat": "~1.0" + }, + "autoload": { + "psr-4": { "Symfony\\Polyfill\\Php55\\": "" }, + "files": [ "bootstrap.php" ] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + } +} diff --git a/vendor/symfony/process/Exception/ProcessFailedException.php b/vendor/symfony/process/Exception/ProcessFailedException.php index 7523a5e..328acfd 100644 --- a/vendor/symfony/process/Exception/ProcessFailedException.php +++ b/vendor/symfony/process/Exception/ProcessFailedException.php @@ -28,10 +28,11 @@ public function __construct(Process $process) throw new InvalidArgumentException('Expected a failed process, but the given process was successful.'); } - $error = sprintf('The command "%s" failed.'."\nExit Code: %s(%s)", + $error = sprintf('The command "%s" failed.'."\n\nExit Code: %s(%s)\n\nWorking directory: %s", $process->getCommandLine(), $process->getExitCode(), - $process->getExitCodeText() + $process->getExitCodeText(), + $process->getWorkingDirectory() ); if (!$process->isOutputDisabled()) { diff --git a/vendor/symfony/process/PhpExecutableFinder.php b/vendor/symfony/process/PhpExecutableFinder.php index f8f57cc..fb29782 100644 --- a/vendor/symfony/process/PhpExecutableFinder.php +++ b/vendor/symfony/process/PhpExecutableFinder.php @@ -35,14 +35,17 @@ public function __construct() */ public function find($includeArgs = true) { + $args = $this->findArguments(); + $args = $includeArgs && $args ? ' '.implode(' ', $args) : ''; + // HHVM support if (defined('HHVM_VERSION')) { - return (getenv('PHP_BINARY') ?: PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : ''); + return (getenv('PHP_BINARY') ?: PHP_BINARY).$args; } // 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 (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) { + return PHP_BINARY.$args; } if ($php = getenv('PHP_PATH')) { @@ -76,9 +79,10 @@ public function findArguments() { $arguments = array(); - // HHVM support if (defined('HHVM_VERSION')) { $arguments[] = '--php'; + } elseif ('phpdbg' === PHP_SAPI) { + $arguments[] = '-qrr'; } return $arguments; diff --git a/vendor/symfony/process/PhpProcess.php b/vendor/symfony/process/PhpProcess.php index 1adbd97..4a2a262 100644 --- a/vendor/symfony/process/PhpProcess.php +++ b/vendor/symfony/process/PhpProcess.php @@ -39,6 +39,13 @@ public function __construct($script, $cwd = null, array $env = null, $timeout = if (false === $php = $executableFinder->find()) { $php = null; } + if ('phpdbg' === PHP_SAPI) { + $file = tempnam(sys_get_temp_dir(), 'dbg'); + file_put_contents($file, $script); + register_shutdown_function('unlink', $file); + $php .= ' '.ProcessUtils::escapeArgument($file); + $script = null; + } parent::__construct($php, $cwd, $env, $script, $timeout, $options); } diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php index 699151f..c1e7321 100644 --- a/vendor/symfony/process/Process.php +++ b/vendor/symfony/process/Process.php @@ -280,8 +280,20 @@ public function start($callback = null) } } + $ptsWorkaround = null; + + if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) { + // Workaround for the bug, when PTS functionality is enabled. + // @see : https://bugs.php.net/69442 + $ptsWorkaround = fopen(__FILE__, 'r'); + } + $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options); + if ($ptsWorkaround) { + fclose($ptsWorkaround); + } + if (!is_resource($this->process)) { throw new RuntimeException('Unable to launch a new process.'); } @@ -763,22 +775,14 @@ public function getStatus() * 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 + * @param int $signal A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL (9) * * @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 ('\\' === DIRECTORY_SEPARATOR && !$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 { @@ -786,13 +790,9 @@ public function stop($timeout = 10, $signal = null) } 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); - } + // Avoid exception here: process is supposed to be running, but it might have stopped just + // after this line. In any case, let's silently discard the error, we cannot do anything. + $this->doSignal($signal ?: 9, false); } } @@ -1461,7 +1461,18 @@ private function doSignal($signal, $throwException) return false; } - if (true !== @proc_terminate($this->process, $signal)) { + if ('\\' === DIRECTORY_SEPARATOR) { + exec(sprintf('taskkill /F /T /PID %d 2>&1', $this->getPid()), $output, $exitCode); + if ($exitCode) { + if ($throwException) { + throw new RuntimeException(sprintf('Unable to kill the process (%s).', implode(' ', $output))); + } + + return false; + } + } + + if (true !== @proc_terminate($this->process, $signal) && '\\' !== DIRECTORY_SEPARATOR) { if ($throwException) { throw new RuntimeException(sprintf('Error while sending signal `%s`.', $signal)); } diff --git a/vendor/symfony/process/composer.json b/vendor/symfony/process/composer.json index 8d21baf..b3cb518 100644 --- a/vendor/symfony/process/composer.json +++ b/vendor/symfony/process/composer.json @@ -19,12 +19,15 @@ "php": ">=5.3.9" }, "autoload": { - "psr-4": { "Symfony\\Component\\Process\\": "" } + "psr-4": { "Symfony\\Component\\Process\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/process/phpunit.xml.dist b/vendor/symfony/process/phpunit.xml.dist index b5d605c..7885000 100644 --- a/vendor/symfony/process/phpunit.xml.dist +++ b/vendor/symfony/process/phpunit.xml.dist @@ -21,6 +21,7 @@ ./ ./Tests + ./vendor diff --git a/vendor/symfony/routing/CHANGELOG.md b/vendor/symfony/routing/CHANGELOG.md index b5fd9db..7f5d9f0 100644 --- a/vendor/symfony/routing/CHANGELOG.md +++ b/vendor/symfony/routing/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +2.8.0 +----- + + * allowed specifying a directory to recursively load all routing configuration files it contains + * Added ObjectRouteLoader and ServiceRouteLoader that allow routes to be loaded + by calling a method on an object/service. + 2.5.0 ----- diff --git a/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php b/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php index b53caaf..943e838 100644 --- a/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php +++ b/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php @@ -53,7 +53,7 @@ public function dump(array $options = array()) */ class {$options['class']} extends {$options['base_class']} { - private static \$declaredRoutes = {$this->generateDeclaredRoutes()}; + private static \$declaredRoutes; /** * Constructor. @@ -62,6 +62,9 @@ public function __construct(RequestContext \$context, LoggerInterface \$logger = { \$this->context = \$context; \$this->logger = \$logger; + if (null === self::\$declaredRoutes) { + self::\$declaredRoutes = {$this->generateDeclaredRoutes()}; + } } {$this->generateGenerateMethod()} diff --git a/vendor/symfony/routing/Generator/UrlGenerator.php b/vendor/symfony/routing/Generator/UrlGenerator.php index 6798951..6e40a30 100644 --- a/vendor/symfony/routing/Generator/UrlGenerator.php +++ b/vendor/symfony/routing/Generator/UrlGenerator.php @@ -143,6 +143,20 @@ public function generate($name, $parameters = array(), $referenceType = self::AB */ protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = array()) { + if (is_bool($referenceType) || is_string($referenceType)) { + @trigger_error('The hardcoded value you are using for the $referenceType argument of the '.__CLASS__.'::generate method is deprecated since version 2.8 and will not be supported anymore in 3.0. Use the constants defined in the UrlGeneratorInterface instead.', E_USER_DEPRECATED); + + if (true === $referenceType) { + $referenceType = self::ABSOLUTE_URL; + } elseif (false === $referenceType) { + $referenceType = self::ABSOLUTE_PATH; + } elseif ('relative' === $referenceType) { + $referenceType = self::RELATIVE_PATH; + } elseif ('network' === $referenceType) { + $referenceType = self::NETWORK_PATH; + } + } + $variables = array_flip($variables); $mergedParams = array_replace($defaults, $this->context->getParameters(), $parameters); diff --git a/vendor/symfony/routing/Generator/UrlGeneratorInterface.php b/vendor/symfony/routing/Generator/UrlGeneratorInterface.php index fc294b7..f501ebd 100644 --- a/vendor/symfony/routing/Generator/UrlGeneratorInterface.php +++ b/vendor/symfony/routing/Generator/UrlGeneratorInterface.php @@ -34,25 +34,25 @@ /** * Generates an absolute URL, e.g. "http://example.com/dir/file". */ - const ABSOLUTE_URL = true; + const ABSOLUTE_URL = 0; /** * Generates an absolute path, e.g. "/dir/file". */ - const ABSOLUTE_PATH = false; + const ABSOLUTE_PATH = 1; /** * Generates a relative path based on the current request path, e.g. "../parent-file". * * @see UrlGenerator::getRelativePath() */ - const RELATIVE_PATH = 'relative'; + const RELATIVE_PATH = 2; /** * Generates a network path, e.g. "//example.com/dir/file". * Such reference reuses the current scheme but specifies the host. */ - const NETWORK_PATH = 'network'; + const NETWORK_PATH = 3; /** * Generates a URL or path for a specific route based on the given parameters. @@ -69,9 +69,9 @@ * * If there is no route with the given name, the generator must throw the RouteNotFoundException. * - * @param string $name The name of the route - * @param mixed $parameters An array of parameters - * @param bool|string $referenceType The type of reference to be generated (one of the constants) + * @param string $name The name of the route + * @param mixed $parameters An array of parameters + * @param int $referenceType The type of reference to be generated (one of the constants) * * @return string The generated URL * diff --git a/vendor/symfony/routing/Loader/DependencyInjection/ServiceRouterLoader.php b/vendor/symfony/routing/Loader/DependencyInjection/ServiceRouterLoader.php new file mode 100644 index 0000000..daa0a15 --- /dev/null +++ b/vendor/symfony/routing/Loader/DependencyInjection/ServiceRouterLoader.php @@ -0,0 +1,41 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Loader\DependencyInjection; + +use Symfony\Component\Config\Loader\Loader; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Routing\Loader\ObjectRouteLoader; + +/** + * A route loader that executes a service to load the routes. + * + * This depends on the DependencyInjection component. + * + * @author Ryan Weaver + */ +class ServiceRouterLoader extends ObjectRouteLoader +{ + /** + * @var ContainerInterface + */ + private $container; + + public function __construct(ContainerInterface $container) + { + $this->container = $container; + } + + protected function getServiceObject($id) + { + return $this->container->get($id); + } +} diff --git a/vendor/symfony/routing/Loader/DirectoryLoader.php b/vendor/symfony/routing/Loader/DirectoryLoader.php new file mode 100644 index 0000000..4bb5b31 --- /dev/null +++ b/vendor/symfony/routing/Loader/DirectoryLoader.php @@ -0,0 +1,58 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Loader; + +use Symfony\Component\Config\Loader\FileLoader; +use Symfony\Component\Routing\RouteCollection; +use Symfony\Component\Config\Resource\DirectoryResource; + +class DirectoryLoader extends FileLoader +{ + /** + * {@inheritdoc} + */ + public function load($file, $type = null) + { + $path = $this->locator->locate($file); + + $collection = new RouteCollection(); + $collection->addResource(new DirectoryResource($path)); + + foreach (scandir($path) as $dir) { + if ('.' !== $dir[0]) { + $this->setCurrentDir($path); + $subPath = $path.'/'.$dir; + $subType = null; + + if (is_dir($subPath)) { + $subPath .= '/'; + $subType = 'directory'; + } + + $subCollection = $this->import($subPath, $subType, false, $path); + $collection->addCollection($subCollection); + } + } + + return $collection; + } + + /** + * {@inheritdoc} + */ + public function supports($resource, $type = null) + { + // only when type is forced to directory, not to conflict with AnnotationLoader + + return 'directory' === $type; + } +} diff --git a/vendor/symfony/routing/Loader/ObjectRouteLoader.php b/vendor/symfony/routing/Loader/ObjectRouteLoader.php new file mode 100644 index 0000000..65d0ce3 --- /dev/null +++ b/vendor/symfony/routing/Loader/ObjectRouteLoader.php @@ -0,0 +1,93 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Loader; + +use Symfony\Component\Config\Loader\Loader; +use Symfony\Component\Config\Resource\FileResource; +use Symfony\Component\Routing\RouteCollection; + +/** + * A route loader that calls a method on an object to load the routes. + * + * @author Ryan Weaver + */ +abstract class ObjectRouteLoader extends Loader +{ + /** + * Returns the object that the method will be called on to load routes. + * + * For example, if your application uses a service container, + * the $id may be a service id. + * + * @param string $id + * + * @return object + */ + abstract protected function getServiceObject($id); + + /** + * Calls the service that will load the routes. + * + * @param mixed $resource Some value that will resolve to a callable + * @param string|null $type The resource type + * + * @return RouteCollection + */ + public function load($resource, $type = null) + { + $parts = explode(':', $resource); + if (count($parts) != 2) { + throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName"', $resource)); + } + + $serviceString = $parts[0]; + $method = $parts[1]; + + $loaderObject = $this->getServiceObject($serviceString); + + if (!is_object($loaderObject)) { + throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned', get_class($this), gettype($loaderObject))); + } + + if (!method_exists($loaderObject, $method)) { + throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, get_class($loaderObject), $resource)); + } + + $routeCollection = call_user_func(array($loaderObject, $method), $this); + + if (!$routeCollection instanceof RouteCollection) { + $type = is_object($routeCollection) ? get_class($routeCollection) : gettype($routeCollection); + + throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned', get_class($loaderObject), $method, $type)); + } + + // make the service file tracked so that if it changes, the cache rebuilds + $this->addClassResource(new \ReflectionClass($loaderObject), $routeCollection); + + return $routeCollection; + } + + /** + * {@inheritdoc} + */ + public function supports($resource, $type = null) + { + return 'service' === $type; + } + + private function addClassResource(\ReflectionClass $class, RouteCollection $collection) + { + do { + $collection->addResource(new FileResource($class->getFileName())); + } while ($class = $class->getParentClass()); + } +} diff --git a/vendor/symfony/routing/RouteCollectionBuilder.php b/vendor/symfony/routing/RouteCollectionBuilder.php new file mode 100644 index 0000000..a54a049 --- /dev/null +++ b/vendor/symfony/routing/RouteCollectionBuilder.php @@ -0,0 +1,372 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing; + +use Symfony\Component\Config\Exception\FileLoaderLoadException; +use Symfony\Component\Config\Loader\LoaderInterface; +use Symfony\Component\Config\Resource\ResourceInterface; + +/** + * Helps add and import routes into a RouteCollection. + * + * @author Ryan Weaver + */ +class RouteCollectionBuilder +{ + /** + * @var Route[]|RouteCollectionBuilder[] + */ + private $routes = array(); + + private $loader; + private $defaults = array(); + private $prefix; + private $host; + private $condition; + private $requirements = array(); + private $options = array(); + private $schemes; + private $methods; + private $resources = array(); + + /** + * @param LoaderInterface $loader + */ + public function __construct(LoaderInterface $loader = null) + { + $this->loader = $loader; + } + + /** + * Import an external routing resource and returns the RouteCollectionBuilder. + * + * $routes->import('blog.yml', '/blog'); + * + * @param mixed $resource + * @param string|null $prefix + * @param string $type + * + * @return RouteCollectionBuilder + * + * @throws FileLoaderLoadException + */ + public function import($resource, $prefix = '/', $type = null) + { + /** @var RouteCollection $collection */ + $collection = $this->load($resource, $type); + + // create a builder from the RouteCollection + $builder = $this->createBuilder(); + foreach ($collection->all() as $name => $route) { + $builder->addRoute($route, $name); + } + + foreach ($collection->getResources() as $resource) { + $builder->addResource($resource); + } + + // mount into this builder + $this->mount($prefix, $builder); + + return $builder; + } + + /** + * Adds a route and returns it for future modification. + * + * @param string $path The route path + * @param string $controller The route's controller + * @param string|null $name The name to give this route + * + * @return Route + */ + public function add($path, $controller, $name = null) + { + $route = new Route($path); + $route->setDefault('_controller', $controller); + $this->addRoute($route, $name); + + return $route; + } + + /** + * Returns a RouteCollectionBuilder that can be configured and then added with mount(). + * + * @return RouteCollectionBuilder + */ + public function createBuilder() + { + return new self($this->loader); + } + + /** + * Add a RouteCollectionBuilder. + * + * @param RouteCollectionBuilder $builder + */ + public function mount($prefix, RouteCollectionBuilder $builder) + { + $builder->prefix = trim(trim($prefix), '/'); + $this->routes[] = $builder; + } + + /** + * Adds a Route object to the builder. + * + * @param Route $route + * @param string|null $name + * + * @return $this + */ + public function addRoute(Route $route, $name = null) + { + if (null === $name) { + // used as a flag to know which routes will need a name later + $name = '_unnamed_route_'.spl_object_hash($route); + } + + $this->routes[$name] = $route; + + return $this; + } + + /** + * Sets the host on all embedded routes (unless already set). + * + * @param string $pattern + * + * @return $this + */ + public function setHost($pattern) + { + $this->host = $pattern; + + return $this; + } + + /** + * Sets a condition on all embedded routes (unless already set). + * + * @param string $condition + * + * @return $this + */ + public function setCondition($condition) + { + $this->condition = $condition; + + return $this; + } + + /** + * Sets a default value that will be added to all embedded routes (unless that + * default value is already set. + * + * @param string $key + * @param mixed $value + * + * @return $this + */ + public function setDefault($key, $value) + { + $this->defaults[$key] = $value; + + return $this; + } + + /** + * Sets a requirement that will be added to all embedded routes (unless that + * requirement is already set. + * + * @param string $key + * @param mixed $regex + * + * @return $this + */ + public function setRequirement($key, $regex) + { + $this->requirements[$key] = $regex; + + return $this; + } + + /** + * Sets an opiton that will be added to all embedded routes (unless that + * option is already set. + * + * @param string $key + * @param mixed $value + * + * @return $this + */ + public function setOption($key, $value) + { + $this->options[$key] = $value; + + return $this; + } + + /** + * Sets the schemes on all embedded routes (unless already set). + * + * @param array|string $schemes + * + * @return $this + */ + public function setSchemes($schemes) + { + $this->schemes = $schemes; + + return $this; + } + + /** + * Sets the methods on all embedded routes (unless already set). + * + * @param array|string $methods + * + * @return $this + */ + public function setMethods($methods) + { + $this->methods = $methods; + + return $this; + } + + /** + * Adds a resource for this collection. + * + * @param ResourceInterface $resource + * + * @return $this + */ + private function addResource(ResourceInterface $resource) + { + $this->resources[] = $resource; + + return $this; + } + + /** + * Creates the final RouteCollection and returns it. + * + * @return RouteCollection + */ + public function build() + { + $routeCollection = new RouteCollection(); + + foreach ($this->routes as $name => $route) { + if ($route instanceof Route) { + $route->setDefaults(array_merge($this->defaults, $route->getDefaults())); + $route->setOptions(array_merge($this->options, $route->getOptions())); + + // we're extra careful here to avoid re-setting deprecated _method and _scheme + foreach ($this->requirements as $key => $val) { + if (!$route->hasRequirement($key)) { + $route->setRequirement($key, $val); + } + } + + if (null !== $this->prefix) { + $route->setPath('/'.$this->prefix.$route->getPath()); + } + + if (!$route->getHost()) { + $route->setHost($this->host); + } + + if (!$route->getCondition()) { + $route->setCondition($this->condition); + } + + if (!$route->getSchemes()) { + $route->setSchemes($this->schemes); + } + + if (!$route->getMethods()) { + $route->setMethods($this->methods); + } + + // auto-generate the route name if it's been marked + if ('_unnamed_route_' === substr($name, 0, 15)) { + $name = $this->generateRouteName($route); + } + + $routeCollection->add($name, $route); + } else { + /* @var self $route */ + $subCollection = $route->build(); + $subCollection->addPrefix($this->prefix); + + $routeCollection->addCollection($subCollection); + } + + foreach ($this->resources as $resource) { + $routeCollection->addResource($resource); + } + } + + return $routeCollection; + } + + /** + * Generates a route name based on details of this route. + * + * @return string + */ + private function generateRouteName(Route $route) + { + $methods = implode('_', $route->getMethods()).'_'; + + $routeName = $methods.$route->getPath(); + $routeName = str_replace(array('/', ':', '|', '-'), '_', $routeName); + $routeName = preg_replace('/[^a-z0-9A-Z_.]+/', '', $routeName); + + // Collapse consecutive underscores down into a single underscore. + $routeName = preg_replace('/_+/', '_', $routeName); + + return $routeName; + } + + /** + * Finds a loader able to load an imported resource and loads it. + * + * @param mixed $resource A resource + * @param string|null $type The resource type or null if unknown + * + * @return RouteCollection + * + * @throws FileLoaderLoadException If no loader is found + */ + private function load($resource, $type = null) + { + if (null === $this->loader) { + throw new \BadMethodCallException('Cannot import other routing resources: you must pass a LoaderInterface when constructing RouteCollectionBuilder.'); + } + + if ($this->loader->supports($resource, $type)) { + return $this->loader->load($resource, $type); + } + + if (null === $resolver = $this->loader->getResolver()) { + throw new FileLoaderLoadException($resource); + } + + if (false === $loader = $resolver->resolve($resource, $type)) { + throw new FileLoaderLoadException($resource); + } + + return $loader->load($resource, $type); + } +} diff --git a/vendor/symfony/routing/composer.json b/vendor/symfony/routing/composer.json index 02837f6..9028e79 100644 --- a/vendor/symfony/routing/composer.json +++ b/vendor/symfony/routing/composer.json @@ -19,10 +19,10 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/config": "~2.7", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5", - "symfony/expression-language": "~2.4", + "symfony/config": "~2.7|~3.0.0", + "symfony/http-foundation": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0" @@ -34,15 +34,19 @@ "symfony/config": "For using the all-in-one router or any loader", "symfony/yaml": "For using the YAML loader", "symfony/expression-language": "For using expression matching", - "doctrine/annotations": "For using the annotation loader" + "doctrine/annotations": "For using the annotation loader", + "symfony/dependency-injection": "For loading routes from a service" }, "autoload": { - "psr-4": { "Symfony\\Component\\Routing\\": "" } + "psr-4": { "Symfony\\Component\\Routing\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/routing/phpunit.xml.dist b/vendor/symfony/routing/phpunit.xml.dist index a908308..b69f066 100644 --- a/vendor/symfony/routing/phpunit.xml.dist +++ b/vendor/symfony/routing/phpunit.xml.dist @@ -20,8 +20,8 @@ ./ - ./vendor ./Tests + ./vendor diff --git a/vendor/symfony/serializer/Encoder/JsonDecode.php b/vendor/symfony/serializer/Encoder/JsonDecode.php index 5f5f289..8925ec3 100644 --- a/vendor/symfony/serializer/Encoder/JsonDecode.php +++ b/vendor/symfony/serializer/Encoder/JsonDecode.php @@ -108,7 +108,7 @@ public function decode($data, $format, array $context = array()) } if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) { - throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage()); + throw new UnexpectedValueException(json_last_error_msg()); } return $decodedData; diff --git a/vendor/symfony/serializer/Encoder/JsonEncode.php b/vendor/symfony/serializer/Encoder/JsonEncode.php index 3a6b2fd..454c0d6 100644 --- a/vendor/symfony/serializer/Encoder/JsonEncode.php +++ b/vendor/symfony/serializer/Encoder/JsonEncode.php @@ -56,7 +56,7 @@ public function encode($data, $format, array $context = array()) $encodedJson = json_encode($data, $context['json_encode_options']); if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) { - throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage()); + throw new UnexpectedValueException(json_last_error_msg()); } return $encodedJson; diff --git a/vendor/symfony/serializer/Encoder/JsonEncoder.php b/vendor/symfony/serializer/Encoder/JsonEncoder.php index 284f579..159d435 100644 --- a/vendor/symfony/serializer/Encoder/JsonEncoder.php +++ b/vendor/symfony/serializer/Encoder/JsonEncoder.php @@ -100,26 +100,13 @@ public function supportsDecoding($format) * Resolves json_last_error message. * * @return string + * + * @deprecated since 2.8, to be removed in 3.0. Use json_last_error_msg() instead. */ public static function getLastErrorMessage() { - if (function_exists('json_last_error_msg')) { - return json_last_error_msg(); - } - - switch (json_last_error()) { - case JSON_ERROR_DEPTH: - return 'Maximum stack depth exceeded'; - case JSON_ERROR_STATE_MISMATCH: - return 'Underflow or the modes mismatch'; - case JSON_ERROR_CTRL_CHAR: - return 'Unexpected control character found'; - case JSON_ERROR_SYNTAX: - return 'Syntax error, malformed JSON'; - case JSON_ERROR_UTF8: - return 'Malformed UTF-8 characters, possibly incorrectly encoded'; - default: - return 'Unknown error'; - } + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use json_last_error_msg() instead.', E_USER_DEPRECATED); + + return json_last_error_msg(); } } diff --git a/vendor/symfony/serializer/Exception/BadMethodCallException.php b/vendor/symfony/serializer/Exception/BadMethodCallException.php new file mode 100644 index 0000000..b2f3d61 --- /dev/null +++ b/vendor/symfony/serializer/Exception/BadMethodCallException.php @@ -0,0 +1,16 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Serializer\Exception; + +class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface +{ +} diff --git a/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php b/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php new file mode 100644 index 0000000..921e312 --- /dev/null +++ b/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php @@ -0,0 +1,77 @@ + + * + * 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\BadMethodCallException; +use Symfony\Component\Serializer\Exception\InvalidArgumentException; +use Symfony\Component\Serializer\SerializerAwareInterface; +use Symfony\Component\Serializer\SerializerInterface; + +/** + * Denormalizes arrays of objects. + * + * @author Alexander M. Turek + */ +class ArrayDenormalizer implements DenormalizerInterface, SerializerAwareInterface +{ + /** + * @var SerializerInterface|DenormalizerInterface + */ + private $serializer; + + /** + * {@inheritdoc} + */ + public function denormalize($data, $class, $format = null, array $context = array()) + { + if ($this->serializer === null) { + throw new BadMethodCallException('Please set a serializer before calling denormalize()!'); + } + if (!is_array($data)) { + throw new InvalidArgumentException('Data expected to be an array, '.gettype($data).' given.'); + } + if (substr($class, -2) !== '[]') { + throw new InvalidArgumentException('Unsupported class: '.$class); + } + + $serializer = $this->serializer; + $class = substr($class, 0, -2); + + return array_map( + function ($data) use ($serializer, $class, $format, $context) { + return $serializer->denormalize($data, $class, $format, $context); + }, + $data + ); + } + + /** + * {@inheritdoc} + */ + public function supportsDenormalization($data, $type, $format = null) + { + return substr($type, -2) === '[]' + && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format); + } + + /** + * {@inheritdoc} + */ + public function setSerializer(SerializerInterface $serializer) + { + if (!$serializer instanceof DenormalizerInterface) { + throw new InvalidArgumentException('Expected a serializer that also implements DenormalizerInterface.'); + } + + $this->serializer = $serializer; + } +} diff --git a/vendor/symfony/serializer/Normalizer/CustomNormalizer.php b/vendor/symfony/serializer/Normalizer/CustomNormalizer.php index 83c3c14..7df266a 100644 --- a/vendor/symfony/serializer/Normalizer/CustomNormalizer.php +++ b/vendor/symfony/serializer/Normalizer/CustomNormalizer.php @@ -59,6 +59,10 @@ public function supportsNormalization($data, $format = null) */ public function supportsDenormalization($data, $type, $format = null) { + if (!class_exists($type)) { + return false; + } + $class = new \ReflectionClass($type); return $class->isSubclassOf('Symfony\Component\Serializer\Normalizer\DenormalizableInterface'); diff --git a/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php b/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php index 44a71cf..fc7ac9f 100644 --- a/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php +++ b/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php @@ -114,7 +114,7 @@ public function denormalize($data, $class, $format = null, array $context = arra if ($allowed && !$ignored) { $setter = 'set'.ucfirst($attribute); - if (in_array($setter, $classMethods)) { + if (in_array($setter, $classMethods) && !$reflectionClass->getMethod($setter)->isStatic()) { $object->$setter($value); } } @@ -136,7 +136,7 @@ public function supportsNormalization($data, $format = null) */ public function supportsDenormalization($data, $type, $format = null) { - return $this->supports($type); + return class_exists($type) && $this->supports($type); } /** @@ -170,10 +170,13 @@ private function isGetMethod(\ReflectionMethod $method) { $methodLength = strlen($method->name); - return ( - ((0 === strpos($method->name, 'get') && 3 < $methodLength) || - (0 === strpos($method->name, 'is') && 2 < $methodLength)) && - 0 === $method->getNumberOfRequiredParameters() - ); + return + !$method->isStatic() && + ( + ((0 === strpos($method->name, 'get') && 3 < $methodLength) || + (0 === strpos($method->name, 'is') && 2 < $methodLength)) && + 0 === $method->getNumberOfRequiredParameters() + ) + ; } } diff --git a/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php b/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php index ba84ac7..c731dd7 100644 --- a/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php +++ b/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php @@ -26,6 +26,8 @@ */ class ObjectNormalizer extends AbstractNormalizer { + private static $attributesCache = array(); + /** * @var PropertyAccessorInterface */ @@ -58,39 +60,7 @@ public function normalize($object, $format = null, array $context = array()) } $data = array(); - $attributes = $this->getAllowedAttributes($object, $context, true); - - // If not using groups, detect manually - if (false === $attributes) { - $attributes = array(); - - // methods - $reflClass = new \ReflectionClass($object); - foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) { - if ( - !$reflMethod->isConstructor() && - !$reflMethod->isDestructor() && - 0 === $reflMethod->getNumberOfRequiredParameters() - ) { - $name = $reflMethod->getName(); - - if (strpos($name, 'get') === 0 || strpos($name, 'has') === 0) { - // getters and hassers - $attributes[lcfirst(substr($name, 3))] = true; - } elseif (strpos($name, 'is') === 0) { - // issers - $attributes[lcfirst(substr($name, 2))] = true; - } - } - } - - // properties - foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) { - $attributes[$reflProperty->getName()] = true; - } - - $attributes = array_keys($attributes); - } + $attributes = $this->getAttributes($object, $context); foreach ($attributes as $attribute) { if (in_array($attribute, $this->ignoredAttributes)) { @@ -159,4 +129,64 @@ public function denormalize($data, $class, $format = null, array $context = arra return $object; } + + /** + * Gets and caches attributes for this class and context. + * + * @param object $object + * @param array $context + * + * @return array + */ + private function getAttributes($object, array $context) + { + $key = sprintf('%s-%s', get_class($object), serialize($context)); + + if (isset(self::$attributesCache[$key])) { + return self::$attributesCache[$key]; + } + + $allowedAttributes = $this->getAllowedAttributes($object, $context, true); + + if (false !== $allowedAttributes) { + return self::$attributesCache[$key] = $allowedAttributes; + } + + // If not using groups, detect manually + $attributes = array(); + + // methods + $reflClass = new \ReflectionClass($object); + foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) { + if ( + $reflMethod->getNumberOfRequiredParameters() !== 0 || + $reflMethod->isStatic() || + $reflMethod->isConstructor() || + $reflMethod->isDestructor() + ) { + continue; + } + + $name = $reflMethod->getName(); + + if (strpos($name, 'get') === 0 || strpos($name, 'has') === 0) { + // getters and hassers + $attributes[lcfirst(substr($name, 3))] = true; + } elseif (strpos($name, 'is') === 0) { + // issers + $attributes[lcfirst(substr($name, 2))] = true; + } + } + + // properties + foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) { + if ($reflProperty->isStatic()) { + continue; + } + + $attributes[$reflProperty->getName()] = true; + } + + return self::$attributesCache[$key] = array_keys($attributes); + } } diff --git a/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php b/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php index c8e83d1..993046f 100644 --- a/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php +++ b/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php @@ -50,7 +50,7 @@ public function normalize($object, $format = null, array $context = array()) $allowedAttributes = $this->getAllowedAttributes($object, $context, true); foreach ($reflectionObject->getProperties() as $property) { - if (in_array($property->name, $this->ignoredAttributes)) { + if (in_array($property->name, $this->ignoredAttributes) || $property->isStatic()) { continue; } @@ -110,6 +110,10 @@ public function denormalize($data, $class, $format = null, array $context = arra if ($allowed && !$ignored && $reflectionClass->hasProperty($propertyName)) { $property = $reflectionClass->getProperty($propertyName); + if ($property->isStatic()) { + continue; + } + // Override visibility if (!$property->isPublic()) { $property->setAccessible(true); @@ -135,7 +139,7 @@ public function supportsNormalization($data, $format = null) */ public function supportsDenormalization($data, $type, $format = null) { - return $this->supports($type); + return class_exists($type) && $this->supports($type); } /** diff --git a/vendor/symfony/serializer/composer.json b/vendor/symfony/serializer/composer.json index 0db008b..88b7832 100644 --- a/vendor/symfony/serializer/composer.json +++ b/vendor/symfony/serializer/composer.json @@ -16,12 +16,13 @@ } ], "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-php55": "~1.0" }, "require-dev": { - "symfony/yaml": "~2.0,>=2.0.5", - "symfony/config": "~2.2", - "symfony/property-access": "~2.3", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/config": "~2.2|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0" }, @@ -33,12 +34,15 @@ "symfony/property-access": "For using the ObjectNormalizer." }, "autoload": { - "psr-4": { "Symfony\\Component\\Serializer\\": "" } + "psr-4": { "Symfony\\Component\\Serializer\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/serializer/phpunit.xml.dist b/vendor/symfony/serializer/phpunit.xml.dist index 279e1eb..4799e3c 100644 --- a/vendor/symfony/serializer/phpunit.xml.dist +++ b/vendor/symfony/serializer/phpunit.xml.dist @@ -20,8 +20,8 @@ ./ - ./vendor ./Tests + ./vendor diff --git a/vendor/symfony/translation/CHANGELOG.md b/vendor/symfony/translation/CHANGELOG.md index 157752c..45f15a0 100644 --- a/vendor/symfony/translation/CHANGELOG.md +++ b/vendor/symfony/translation/CHANGELOG.md @@ -1,6 +1,22 @@ CHANGELOG ========= +2.8.0 +----- + + * deprecated FileDumper::format(), overwrite FileDumper::formatCatalogue() instead. + * deprecated Translator::getMessages(), rely on TranslatorBagInterface::getCatalogue() instead. + * added `FileDumper::formatCatalogue` which allows format the catalogue without dumping it into file. + * added option `json_encoding` to JsonFileDumper + * added options `as_tree`, `inline` to YamlFileDumper + * added support for XLIFF 2.0. + * added support for XLIFF target and tool attributes. + * added message parameters to DataCollectorTranslator. + * [DEPRECATION] The `DiffOperation` class has been deprecated and + will be removed in Symfony 3.0, since its operation has nothing to do with 'diff', + so the class name is misleading. The `TargetOperation` class should be used for + this use-case instead. + 2.7.0 ----- diff --git a/vendor/symfony/translation/Catalogue/AbstractOperation.php b/vendor/symfony/translation/Catalogue/AbstractOperation.php index 062056b..9598e17 100644 --- a/vendor/symfony/translation/Catalogue/AbstractOperation.php +++ b/vendor/symfony/translation/Catalogue/AbstractOperation.php @@ -17,38 +17,60 @@ /** * Base catalogues binary operation class. * + * A catalogue binary operation performs operation on + * source (the left argument) and target (the right argument) catalogues. + * * @author Jean-François Simon */ abstract class AbstractOperation implements OperationInterface { /** - * @var MessageCatalogueInterface + * @var MessageCatalogueInterface The source catalogue */ protected $source; /** - * @var MessageCatalogueInterface + * @var MessageCatalogueInterface The target catalogue */ protected $target; /** - * @var MessageCatalogue + * @var MessageCatalogue The result catalogue */ protected $result; /** - * @var null|array + * @var null|array The domains affected by this operation */ private $domains; /** - * @var array + * This array stores 'all', 'new' and 'obsolete' messages for all valid domains. + * + * The data structure of this array is as follows: + * ```php + * array( + * 'domain 1' => array( + * 'all' => array(...), + * 'new' => array(...), + * 'obsolete' => array(...) + * ), + * 'domain 2' => array( + * 'all' => array(...), + * 'new' => array(...), + * 'obsolete' => array(...) + * ), + * ... + * ) + * ``` + * + * @var array The array that stores 'all', 'new' and 'obsolete' messages */ protected $messages; /** - * @param MessageCatalogueInterface $source - * @param MessageCatalogueInterface $target + * @param MessageCatalogueInterface $source The source catalogue + * @param MessageCatalogueInterface $target The target catalogue * * @throws \LogicException */ @@ -140,7 +162,10 @@ public function getResult() } /** - * @param string $domain + * Performs operation on source and target catalogues for the given domain and + * stores the results. + * + * @param string $domain The domain which the operation will be performed for */ abstract protected function processDomain($domain); } diff --git a/vendor/symfony/translation/Catalogue/DiffOperation.php b/vendor/symfony/translation/Catalogue/DiffOperation.php index 2d1994e..cb9a6f5 100644 --- a/vendor/symfony/translation/Catalogue/DiffOperation.php +++ b/vendor/symfony/translation/Catalogue/DiffOperation.php @@ -11,45 +11,23 @@ namespace Symfony\Component\Translation\Catalogue; +@trigger_error('The '.__NAMESPACE__.'\DiffOperation class is deprecated since version 2.8 and will be removed in 3.0. Use the TargetOperation class in the same namespace instead.', E_USER_DEPRECATED); + /** * Diff operation between two catalogues. * + * The name of 'Diff' is misleading because the operation + * has nothing to do with diff: + * + * intersection = source ∩ target = {x: x ∈ source ∧ x ∈ target} + * all = intersection ∪ (target ∖ intersection) = target + * new = all ∖ source = {x: x ∈ target ∧ x ∉ source} + * obsolete = source ∖ all = source ∖ target = {x: x ∈ source ∧ x ∉ target} + * * @author Jean-François Simon + * + * @deprecated since version 2.8, to be removed in 3.0. Use TargetOperation instead. */ -class DiffOperation extends AbstractOperation +class DiffOperation extends TargetOperation { - /** - * {@inheritdoc} - */ - protected function processDomain($domain) - { - $this->messages[$domain] = array( - 'all' => array(), - 'new' => array(), - 'obsolete' => array(), - ); - - foreach ($this->source->all($domain) as $id => $message) { - if ($this->target->has($id, $domain)) { - $this->messages[$domain]['all'][$id] = $message; - $this->result->add(array($id => $message), $domain); - if (null !== $keyMetadata = $this->source->getMetadata($id, $domain)) { - $this->result->setMetadata($id, $keyMetadata, $domain); - } - } else { - $this->messages[$domain]['obsolete'][$id] = $message; - } - } - - foreach ($this->target->all($domain) as $id => $message) { - if (!$this->source->has($id, $domain)) { - $this->messages[$domain]['all'][$id] = $message; - $this->messages[$domain]['new'][$id] = $message; - $this->result->add(array($id => $message), $domain); - if (null !== $keyMetadata = $this->target->getMetadata($id, $domain)) { - $this->result->setMetadata($id, $keyMetadata, $domain); - } - } - } - } } diff --git a/vendor/symfony/translation/Catalogue/MergeOperation.php b/vendor/symfony/translation/Catalogue/MergeOperation.php index 562ca0e..6db3f80 100644 --- a/vendor/symfony/translation/Catalogue/MergeOperation.php +++ b/vendor/symfony/translation/Catalogue/MergeOperation.php @@ -12,7 +12,11 @@ namespace Symfony\Component\Translation\Catalogue; /** - * Merge operation between two catalogues. + * Merge operation between two catalogues as follows: + * all = source ∪ target = {x: x ∈ source ∨ x ∈ target} + * new = all ∖ source = {x: x ∈ target ∧ x ∉ source} + * obsolete = source ∖ all = {x: x ∈ source ∧ x ∉ source ∧ x ∉ target} = ∅ + * Basically, the result contains messages from both catalogues. * * @author Jean-François Simon */ diff --git a/vendor/symfony/translation/Catalogue/OperationInterface.php b/vendor/symfony/translation/Catalogue/OperationInterface.php index d72378a..87d888e 100644 --- a/vendor/symfony/translation/Catalogue/OperationInterface.php +++ b/vendor/symfony/translation/Catalogue/OperationInterface.php @@ -16,6 +16,20 @@ /** * Represents an operation on catalogue(s). * + * An instance of this interface performs an operation on one or more catalogues and + * stores intermediate and final results of the operation. + * + * The first catalogue in its argument(s) is called the 'source catalogue' or 'source' and + * the following results are stored: + * + * Messages: also called 'all', are valid messages for the given domain after the operation is performed. + * + * New Messages: also called 'new' (new = all ∖ source = {x: x ∈ all ∧ x ∉ source}). + * + * Obsolete Messages: also called 'obsolete' (obsolete = source ∖ all = {x: x ∈ source ∧ x ∉ all}). + * + * Result: also called 'result', is the resulting catalogue for the given domain that holds the same messages as 'all'. + * * @author Jean-François Simon */ interface OperationInterface @@ -28,7 +42,7 @@ public function getDomains(); /** - * Returns all valid messages after operation. + * Returns all valid messages ('all') after operation. * * @param string $domain * @@ -37,7 +51,7 @@ public function getDomains(); public function getMessages($domain); /** - * Returns new messages after operation. + * Returns new messages ('new') after operation. * * @param string $domain * @@ -46,7 +60,7 @@ public function getMessages($domain); public function getNewMessages($domain); /** - * Returns obsolete messages after operation. + * Returns obsolete messages ('obsolete') after operation. * * @param string $domain * @@ -55,7 +69,7 @@ public function getNewMessages($domain); public function getObsoleteMessages($domain); /** - * Returns resulting catalogue. + * Returns resulting catalogue ('result'). * * @return MessageCatalogueInterface */ diff --git a/vendor/symfony/translation/Catalogue/TargetOperation.php b/vendor/symfony/translation/Catalogue/TargetOperation.php new file mode 100644 index 0000000..eea1fef --- /dev/null +++ b/vendor/symfony/translation/Catalogue/TargetOperation.php @@ -0,0 +1,69 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Translation\Catalogue; + +/** + * Target operation between two catalogues: + * intersection = source ∩ target = {x: x ∈ source ∧ x ∈ target} + * all = intersection ∪ (target ∖ intersection) = target + * new = all ∖ source = {x: x ∈ target ∧ x ∉ source} + * obsolete = source ∖ all = source ∖ target = {x: x ∈ source ∧ x ∉ target} + * Basically, the result contains messages from the target catalogue. + * + * @author Michael Lee + */ +class TargetOperation extends AbstractOperation +{ + /** + * {@inheritdoc} + */ + protected function processDomain($domain) + { + $this->messages[$domain] = array( + 'all' => array(), + 'new' => array(), + 'obsolete' => array(), + ); + + // For 'all' messages, the code can't be simplified as ``$this->messages[$domain]['all'] = $target->all($domain);``, + // because doing so will drop messages like {x: x ∈ source ∧ x ∉ target.all ∧ x ∈ target.fallback} + // + // For 'new' messages, the code can't be simplied as ``array_diff_assoc($this->target->all($domain), $this->source->all($domain));`` + // because doing so will not exclude messages like {x: x ∈ target ∧ x ∉ source.all ∧ x ∈ source.fallback} + // + // For 'obsolete' messages, the code can't be simplifed as ``array_diff_assoc($this->source->all($domain), $this->target->all($domain))`` + // because doing so will not exclude messages like {x: x ∈ source ∧ x ∉ target.all ∧ x ∈ target.fallback} + + foreach ($this->source->all($domain) as $id => $message) { + if ($this->target->has($id, $domain)) { + $this->messages[$domain]['all'][$id] = $message; + $this->result->add(array($id => $message), $domain); + if (null !== $keyMetadata = $this->source->getMetadata($id, $domain)) { + $this->result->setMetadata($id, $keyMetadata, $domain); + } + } else { + $this->messages[$domain]['obsolete'][$id] = $message; + } + } + + foreach ($this->target->all($domain) as $id => $message) { + if (!$this->source->has($id, $domain)) { + $this->messages[$domain]['all'][$id] = $message; + $this->messages[$domain]['new'][$id] = $message; + $this->result->add(array($id => $message), $domain); + if (null !== $keyMetadata = $this->target->getMetadata($id, $domain)) { + $this->result->setMetadata($id, $keyMetadata, $domain); + } + } + } + } +} diff --git a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php index c3c140f..cb59d0a 100644 --- a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php +++ b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php @@ -101,9 +101,14 @@ private function sanitizeCollectedMessages($messages) if (!isset($result[$messageId])) { $message['count'] = 1; + $message['parameters'] = !empty($message['parameters']) ? array($message['parameters']) : array(); $messages[$key]['translation'] = $this->sanitizeString($message['translation']); $result[$messageId] = $message; } else { + if (!empty($message['parameters'])) { + $result[$messageId]['parameters'][] = $message['parameters']; + } + ++$result[$messageId]['count']; } @@ -132,7 +137,7 @@ private function sanitizeString($string, $length = 80) { $string = trim(preg_replace('/\s+/', ' ', $string)); - if (function_exists('mb_strlen') && false !== $encoding = mb_detect_encoding($string)) { + if (false !== $encoding = mb_detect_encoding($string, null, true)) { if (mb_strlen($string, $encoding) > $length) { return mb_substr($string, 0, $length - 3, $encoding).'...'; } diff --git a/vendor/symfony/translation/DataCollectorTranslator.php b/vendor/symfony/translation/DataCollectorTranslator.php index 4c69ff6..d507cde 100644 --- a/vendor/symfony/translation/DataCollectorTranslator.php +++ b/vendor/symfony/translation/DataCollectorTranslator.php @@ -48,7 +48,7 @@ public function __construct(TranslatorInterface $translator) public function trans($id, array $parameters = array(), $domain = null, $locale = null) { $trans = $this->translator->trans($id, $parameters, $domain, $locale); - $this->collectMessage($locale, $domain, $id, $trans); + $this->collectMessage($locale, $domain, $id, $trans, $parameters); return $trans; } @@ -59,7 +59,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null) { $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale); - $this->collectMessage($locale, $domain, $id, $trans); + $this->collectMessage($locale, $domain, $id, $trans, $parameters, $number); return $trans; } @@ -108,9 +108,11 @@ public function getCollectedMessages() * @param string|null $locale * @param string|null $domain * @param string $id - * @param string $trans + * @param string $translation + * @param array|null $parameters + * @param int|null $number */ - private function collectMessage($locale, $domain, $id, $translation) + private function collectMessage($locale, $domain, $id, $translation, $parameters = array(), $number = null) { if (null === $domain) { $domain = 'messages'; @@ -142,6 +144,8 @@ private function collectMessage($locale, $domain, $id, $translation) 'domain' => $domain, 'id' => $id, 'translation' => $translation, + 'parameters' => $parameters, + 'transChoiceNumber' => $number, 'state' => $state, ); } diff --git a/vendor/symfony/translation/Dumper/CsvFileDumper.php b/vendor/symfony/translation/Dumper/CsvFileDumper.php index 08005b0..afadcd8 100644 --- a/vendor/symfony/translation/Dumper/CsvFileDumper.php +++ b/vendor/symfony/translation/Dumper/CsvFileDumper.php @@ -28,6 +28,16 @@ class CsvFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain = 'messages') { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $handle = fopen('php://memory', 'rb+'); foreach ($messages->all($domain) as $source => $target) { diff --git a/vendor/symfony/translation/Dumper/FileDumper.php b/vendor/symfony/translation/Dumper/FileDumper.php index f2f17d6..b217d10 100644 --- a/vendor/symfony/translation/Dumper/FileDumper.php +++ b/vendor/symfony/translation/Dumper/FileDumper.php @@ -82,19 +82,42 @@ public function dump(MessageCatalogue $messages, $options = array()) } } // save file - file_put_contents($fullpath, $this->format($messages, $domain)); + file_put_contents($fullpath, $this->formatCatalogue($messages, $domain, $options)); } } /** * Transforms a domain of a message catalogue to its string representation. * + * Override this function in child class if $options is used for message formatting. + * + * @param MessageCatalogue $messages + * @param string $domain + * @param array $options + * + * @return string representation + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { + @trigger_error('The '.__METHOD__.' method will replace the format method in 3.0. You should overwrite it instead of overwriting format instead.', E_USER_DEPRECATED); + + return $this->format($messages, $domain); + } + + /** + * Transforms a domain of a message catalogue to its string representation. + * * @param MessageCatalogue $messages * @param string $domain * * @return string representation + * + * @deprecated since version 2.8, to be removed in 3.0. Overwrite formatCatalogue() instead. */ - abstract protected function format(MessageCatalogue $messages, $domain); + protected function format(MessageCatalogue $messages, $domain) + { + throw new \LogicException('The "FileDumper::format" method needs to be overwritten, you should implement either "format" or "formatCatalogue".'); + } /** * Gets the file extension of the dumper. diff --git a/vendor/symfony/translation/Dumper/IcuResFileDumper.php b/vendor/symfony/translation/Dumper/IcuResFileDumper.php index 0a2ed9f..deb4c7f 100644 --- a/vendor/symfony/translation/Dumper/IcuResFileDumper.php +++ b/vendor/symfony/translation/Dumper/IcuResFileDumper.php @@ -30,6 +30,16 @@ class IcuResFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain = 'messages') { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $data = $indexes = $resources = ''; foreach ($messages->all($domain) as $source => $target) { diff --git a/vendor/symfony/translation/Dumper/IniFileDumper.php b/vendor/symfony/translation/Dumper/IniFileDumper.php index 45df389..36be230 100644 --- a/vendor/symfony/translation/Dumper/IniFileDumper.php +++ b/vendor/symfony/translation/Dumper/IniFileDumper.php @@ -25,6 +25,16 @@ class IniFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain = 'messages') { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $output = ''; foreach ($messages->all($domain) as $source => $target) { diff --git a/vendor/symfony/translation/Dumper/JsonFileDumper.php b/vendor/symfony/translation/Dumper/JsonFileDumper.php index 7ad3518..022e165 100644 --- a/vendor/symfony/translation/Dumper/JsonFileDumper.php +++ b/vendor/symfony/translation/Dumper/JsonFileDumper.php @@ -25,7 +25,23 @@ class JsonFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain = 'messages') { - return json_encode($messages->all($domain), defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0); + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { + if (isset($options['json_encoding'])) { + $flags = $options['json_encoding']; + } else { + $flags = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0; + } + + return json_encode($messages->all($domain), $flags); } /** diff --git a/vendor/symfony/translation/Dumper/MoFileDumper.php b/vendor/symfony/translation/Dumper/MoFileDumper.php index f8dc6ac..a8e123a 100644 --- a/vendor/symfony/translation/Dumper/MoFileDumper.php +++ b/vendor/symfony/translation/Dumper/MoFileDumper.php @@ -26,6 +26,16 @@ class MoFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain = 'messages') { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $output = $sources = $targets = $sourceOffsets = $targetOffsets = ''; $offsets = array(); $size = 0; diff --git a/vendor/symfony/translation/Dumper/PhpFileDumper.php b/vendor/symfony/translation/Dumper/PhpFileDumper.php index b354c12..ea31dda 100644 --- a/vendor/symfony/translation/Dumper/PhpFileDumper.php +++ b/vendor/symfony/translation/Dumper/PhpFileDumper.php @@ -25,6 +25,16 @@ class PhpFileDumper extends FileDumper */ protected function format(MessageCatalogue $messages, $domain) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $output = "all($domain), true).";\n"; return $output; diff --git a/vendor/symfony/translation/Dumper/PoFileDumper.php b/vendor/symfony/translation/Dumper/PoFileDumper.php index 983064b..9e27bc7 100644 --- a/vendor/symfony/translation/Dumper/PoFileDumper.php +++ b/vendor/symfony/translation/Dumper/PoFileDumper.php @@ -25,6 +25,16 @@ class PoFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain = 'messages') { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $output = 'msgid ""'."\n"; $output .= 'msgstr ""'."\n"; $output .= '"Content-Type: text/plain; charset=UTF-8\n"'."\n"; diff --git a/vendor/symfony/translation/Dumper/QtFileDumper.php b/vendor/symfony/translation/Dumper/QtFileDumper.php index 42aa093..5c2a434 100644 --- a/vendor/symfony/translation/Dumper/QtFileDumper.php +++ b/vendor/symfony/translation/Dumper/QtFileDumper.php @@ -25,6 +25,16 @@ class QtFileDumper extends FileDumper */ public function format(MessageCatalogue $messages, $domain) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + { $dom = new \DOMDocument('1.0', 'utf-8'); $dom->formatOutput = true; $ts = $dom->appendChild($dom->createElement('TS')); diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/vendor/symfony/translation/Dumper/XliffFileDumper.php index 58d1973..6a7f655 100644 --- a/vendor/symfony/translation/Dumper/XliffFileDumper.php +++ b/vendor/symfony/translation/Dumper/XliffFileDumper.php @@ -21,22 +21,29 @@ class XliffFileDumper extends FileDumper { /** - * @var string - */ - private $defaultLocale; - - /** * {@inheritdoc} */ - public function dump(MessageCatalogue $messages, $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { + $xliffVersion = '1.2'; + if (array_key_exists('xliff_version', $options)) { + $xliffVersion = $options['xliff_version']; + } + if (array_key_exists('default_locale', $options)) { - $this->defaultLocale = $options['default_locale']; + $defaultLocale = $options['default_locale']; } else { - $this->defaultLocale = \Locale::getDefault(); + $defaultLocale = \Locale::getDefault(); + } + + if ('1.2' === $xliffVersion) { + return $this->dumpXliff1($defaultLocale, $messages, $domain, $options); + } + if ('2.0' === $xliffVersion) { + return $this->dumpXliff2($defaultLocale, $messages, $domain, $options); } - parent::dump($messages, $options); + throw new \InvalidArgumentException(sprintf('No support implemented for dumping XLIFF version "%s".', $xliffVersion)); } /** @@ -44,6 +51,26 @@ public function dump(MessageCatalogue $messages, $options = array()) */ protected function format(MessageCatalogue $messages, $domain) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); + } + + /** + * {@inheritdoc} + */ + protected function getExtension() + { + return 'xlf'; + } + + private function dumpXliff1($defaultLocale, MessageCatalogue $messages, $domain, array $options = array()) + { + $toolInfo = array('tool-id' => 'symfony', 'tool-name' => 'Symfony'); + if (array_key_exists('tool_info', $options)) { + $toolInfo = array_merge($toolInfo, $options['tool_info']); + } + $dom = new \DOMDocument('1.0', 'utf-8'); $dom->formatOutput = true; @@ -52,11 +79,17 @@ protected function format(MessageCatalogue $messages, $domain) $xliff->setAttribute('xmlns', 'urn:oasis:names:tc:xliff:document:1.2'); $xliffFile = $xliff->appendChild($dom->createElement('file')); - $xliffFile->setAttribute('source-language', str_replace('_', '-', $this->defaultLocale)); + $xliffFile->setAttribute('source-language', str_replace('_', '-', $defaultLocale)); $xliffFile->setAttribute('target-language', str_replace('_', '-', $messages->getLocale())); $xliffFile->setAttribute('datatype', 'plaintext'); $xliffFile->setAttribute('original', 'file.ext'); + $xliffHead = $xliffFile->appendChild($dom->createElement('header')); + $xliffTool = $xliffHead->appendChild($dom->createElement('tool')); + foreach ($toolInfo as $id => $value) { + $xliffTool->setAttribute($id, $value); + } + $xliffBody = $xliffFile->appendChild($dom->createElement('body')); foreach ($messages->all($domain) as $source => $target) { $translation = $dom->createElement('trans-unit'); @@ -70,11 +103,17 @@ protected function format(MessageCatalogue $messages, $domain) // Does the target contain characters requiring a CDATA section? $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target); - $t = $translation->appendChild($dom->createElement('target')); + $targetElement = $dom->createElement('target'); + $metadata = $messages->getMetadata($source, $domain); + if ($this->hasMetadataArrayInfo('target-attributes', $metadata)) { + foreach ($metadata['target-attributes'] as $name => $value) { + $targetElement->setAttribute($name, $value); + } + } + $t = $translation->appendChild($targetElement); $t->appendChild($text); - $metadata = $messages->getMetadata($source, $domain); - if (null !== $metadata && array_key_exists('notes', $metadata) && is_array($metadata['notes'])) { + if ($this->hasMetadataArrayInfo('notes', $metadata)) { foreach ($metadata['notes'] as $note) { if (!isset($note['content'])) { continue; @@ -99,11 +138,56 @@ protected function format(MessageCatalogue $messages, $domain) return $dom->saveXML(); } + private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain, array $options = array()) + { + $dom = new \DOMDocument('1.0', 'utf-8'); + $dom->formatOutput = true; + + $xliff = $dom->appendChild($dom->createElement('xliff')); + $xliff->setAttribute('xmlns', 'urn:oasis:names:tc:xliff:document:2.0'); + $xliff->setAttribute('version', '2.0'); + $xliff->setAttribute('srcLang', str_replace('_', '-', $defaultLocale)); + $xliff->setAttribute('trgLang', str_replace('_', '-', $messages->getLocale())); + + $xliffFile = $xliff->appendChild($dom->createElement('file')); + $xliffFile->setAttribute('id', $domain.'.'.$messages->getLocale()); + + foreach ($messages->all($domain) as $source => $target) { + $translation = $dom->createElement('unit'); + $translation->setAttribute('id', md5($source)); + + $segment = $translation->appendChild($dom->createElement('segment')); + + $s = $segment->appendChild($dom->createElement('source')); + $s->appendChild($dom->createTextNode($source)); + + // Does the target contain characters requiring a CDATA section? + $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target); + + $targetElement = $dom->createElement('target'); + $metadata = $messages->getMetadata($source, $domain); + if ($this->hasMetadataArrayInfo('target-attributes', $metadata)) { + foreach ($metadata['target-attributes'] as $name => $value) { + $targetElement->setAttribute($name, $value); + } + } + $t = $segment->appendChild($targetElement); + $t->appendChild($text); + + $xliffFile->appendChild($translation); + } + + return $dom->saveXML(); + } + /** - * {@inheritdoc} + * @param string $key + * @param array|null $metadata + * + * @return bool */ - protected function getExtension() + private function hasMetadataArrayInfo($key, $metadata = null) { - return 'xlf'; + return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable || is_array($metadata[$key])); } } diff --git a/vendor/symfony/translation/Dumper/YamlFileDumper.php b/vendor/symfony/translation/Dumper/YamlFileDumper.php index 870fb98..8e49648 100644 --- a/vendor/symfony/translation/Dumper/YamlFileDumper.php +++ b/vendor/symfony/translation/Dumper/YamlFileDumper.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Translation\Dumper; use Symfony\Component\Translation\MessageCatalogue; +use Symfony\Component\Translation\Util\ArrayConverter; use Symfony\Component\Yaml\Yaml; /** @@ -24,13 +25,33 @@ class YamlFileDumper extends FileDumper /** * {@inheritdoc} */ - protected function format(MessageCatalogue $messages, $domain) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { if (!class_exists('Symfony\Component\Yaml\Yaml')) { throw new \LogicException('Dumping translations in the YAML format requires the Symfony Yaml component.'); } - return Yaml::dump($messages->all($domain)); + $data = $messages->all($domain); + + if (isset($options['as_tree']) && $options['as_tree']) { + $data = ArrayConverter::expandToTree($data); + } + + if (isset($options['inline']) && ($inline = (int) $options['inline']) > 0) { + return Yaml::dump($data, $inline); + } + + return Yaml::dump($data); + } + + /** + * {@inheritdoc} + */ + protected function format(MessageCatalogue $messages, $domain) + { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED); + + return $this->formatCatalogue($messages, $domain); } /** diff --git a/vendor/symfony/translation/Loader/CsvFileLoader.php b/vendor/symfony/translation/Loader/CsvFileLoader.php index 2240179..f1d3443 100644 --- a/vendor/symfony/translation/Loader/CsvFileLoader.php +++ b/vendor/symfony/translation/Loader/CsvFileLoader.php @@ -11,16 +11,14 @@ namespace Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; /** * CsvFileLoader loads translations from CSV files. * * @author Saša Stamenković */ -class CsvFileLoader extends ArrayLoader +class CsvFileLoader extends FileLoader { private $delimiter = ';'; private $enclosure = '"'; @@ -29,16 +27,8 @@ class CsvFileLoader extends ArrayLoader /** * {@inheritdoc} */ - public function load($resource, $locale, $domain = 'messages') + protected function loadResource($resource) { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - $messages = array(); try { @@ -56,13 +46,7 @@ public function load($resource, $locale, $domain = 'messages') } } - $catalogue = parent::load($messages, $locale, $domain); - - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); - } - - return $catalogue; + return $messages; } /** diff --git a/vendor/symfony/translation/Loader/FileLoader.php b/vendor/symfony/translation/Loader/FileLoader.php new file mode 100644 index 0000000..a7f24f4 --- /dev/null +++ b/vendor/symfony/translation/Loader/FileLoader.php @@ -0,0 +1,65 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Translation\Loader; + +use Symfony\Component\Translation\Exception\InvalidResourceException; +use Symfony\Component\Translation\Exception\NotFoundResourceException; +use Symfony\Component\Config\Resource\FileResource; + +/** + * @author Abdellatif Ait boudad + */ +abstract class FileLoader extends ArrayLoader +{ + /** + * {@inheritdoc} + */ + public function load($resource, $locale, $domain = 'messages') + { + if (!stream_is_local($resource)) { + throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); + } + + if (!file_exists($resource)) { + throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); + } + + $messages = $this->loadResource($resource); + + // empty resource + if (null === $messages) { + $messages = array(); + } + + // not an array + if (!is_array($messages)) { + throw new InvalidResourceException(sprintf('Unable to load file "%s".', $resource)); + } + + $catalogue = parent::load($messages, $locale, $domain); + + if (class_exists('Symfony\Component\Config\Resource\FileResource')) { + $catalogue->addResource(new FileResource($resource)); + } + + return $catalogue; + } + + /* + * @param string $resource + * + * @return array + * + * @throws InvalidResourceException If stream content has an invalid format. + */ + abstract protected function loadResource($resource); +} diff --git a/vendor/symfony/translation/Loader/IniFileLoader.php b/vendor/symfony/translation/Loader/IniFileLoader.php index 1b3a7b1..11d9b27 100644 --- a/vendor/symfony/translation/Loader/IniFileLoader.php +++ b/vendor/symfony/translation/Loader/IniFileLoader.php @@ -11,38 +11,18 @@ namespace Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; - /** * IniFileLoader loads translations from an ini file. * * @author stealth35 */ -class IniFileLoader extends ArrayLoader +class IniFileLoader extends FileLoader { /** * {@inheritdoc} */ - public function load($resource, $locale, $domain = 'messages') + protected function loadResource($resource) { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - - $messages = parse_ini_file($resource, true); - - $catalogue = parent::load($messages, $locale, $domain); - - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); - } - - return $catalogue; + return parse_ini_file($resource, true); } } diff --git a/vendor/symfony/translation/Loader/JsonFileLoader.php b/vendor/symfony/translation/Loader/JsonFileLoader.php index 81717f3..ce4e91f 100644 --- a/vendor/symfony/translation/Loader/JsonFileLoader.php +++ b/vendor/symfony/translation/Loader/JsonFileLoader.php @@ -12,29 +12,19 @@ namespace Symfony\Component\Translation\Loader; use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; /** * JsonFileLoader loads translations from an json file. * * @author singles */ -class JsonFileLoader extends ArrayLoader +class JsonFileLoader extends FileLoader { /** * {@inheritdoc} */ - public function load($resource, $locale, $domain = 'messages') + protected function loadResource($resource) { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - $messages = array(); if ($data = file_get_contents($resource)) { $messages = json_decode($data, true); @@ -44,14 +34,7 @@ public function load($resource, $locale, $domain = 'messages') } } - if (null === $messages) { - $messages = array(); - } - - $catalogue = parent::load($messages, $locale, $domain); - $catalogue->addResource(new FileResource($resource)); - - return $catalogue; + return $messages; } /** diff --git a/vendor/symfony/translation/Loader/MoFileLoader.php b/vendor/symfony/translation/Loader/MoFileLoader.php index 746fd52..c27a88e 100644 --- a/vendor/symfony/translation/Loader/MoFileLoader.php +++ b/vendor/symfony/translation/Loader/MoFileLoader.php @@ -12,13 +12,11 @@ namespace Symfony\Component\Translation\Loader; use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; /** * @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/) */ -class MoFileLoader extends ArrayLoader +class MoFileLoader extends FileLoader { /** * Magic used for validating the format of a MO file as well as @@ -43,48 +41,13 @@ class MoFileLoader extends ArrayLoader */ const MO_HEADER_SIZE = 28; - public function load($resource, $locale, $domain = 'messages') - { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - - $messages = $this->parse($resource); - - // empty file - if (null === $messages) { - $messages = array(); - } - - // not an array - if (!is_array($messages)) { - throw new InvalidResourceException(sprintf('The file "%s" must contain a valid mo file.', $resource)); - } - - $catalogue = parent::load($messages, $locale, $domain); - - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); - } - - return $catalogue; - } - /** * Parses machine object (MO) format, independent of the machine's endian it * was created on. Both 32bit and 64bit systems are supported. * - * @param resource $resource - * - * @return array - * - * @throws InvalidResourceException If stream content has an invalid format. + * {@inheritdoc} */ - private function parse($resource) + protected function loadResource($resource) { $stream = fopen($resource, 'r'); diff --git a/vendor/symfony/translation/Loader/PhpFileLoader.php b/vendor/symfony/translation/Loader/PhpFileLoader.php index a52e0bb..a0050e8 100644 --- a/vendor/symfony/translation/Loader/PhpFileLoader.php +++ b/vendor/symfony/translation/Loader/PhpFileLoader.php @@ -11,38 +11,18 @@ namespace Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; - /** * PhpFileLoader loads translations from PHP files returning an array of translations. * * @author Fabien Potencier */ -class PhpFileLoader extends ArrayLoader +class PhpFileLoader extends FileLoader { /** * {@inheritdoc} */ - public function load($resource, $locale, $domain = 'messages') + protected function loadResource($resource) { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - - $messages = require $resource; - - $catalogue = parent::load($messages, $locale, $domain); - - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); - } - - return $catalogue; + return require $resource; } } diff --git a/vendor/symfony/translation/Loader/PoFileLoader.php b/vendor/symfony/translation/Loader/PoFileLoader.php index b5d12e9..84664d6 100644 --- a/vendor/symfony/translation/Loader/PoFileLoader.php +++ b/vendor/symfony/translation/Loader/PoFileLoader.php @@ -11,47 +11,12 @@ namespace Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; - /** * @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/) * @copyright Copyright (c) 2012, Clemens Tolboom */ -class PoFileLoader extends ArrayLoader +class PoFileLoader extends FileLoader { - public function load($resource, $locale, $domain = 'messages') - { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - - $messages = $this->parse($resource); - - // empty file - if (null === $messages) { - $messages = array(); - } - - // not an array - if (!is_array($messages)) { - throw new InvalidResourceException(sprintf('The file "%s" must contain a valid po file.', $resource)); - } - - $catalogue = parent::load($messages, $locale, $domain); - - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); - } - - return $catalogue; - } - /** * Parses portable object (PO) format. * @@ -93,11 +58,9 @@ public function load($resource, $locale, $domain = 'messages') * * Items with an empty id are ignored. * - * @param resource $resource - * - * @return array + * {@inheritdoc} */ - private function parse($resource) + protected function loadResource($resource) { $stream = fopen($resource, 'r'); diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php index 0e335db..bdca110 100644 --- a/vendor/symfony/translation/Loader/XliffFileLoader.php +++ b/vendor/symfony/translation/Loader/XliffFileLoader.php @@ -37,10 +37,49 @@ public function load($resource, $locale, $domain = 'messages') throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); } - list($xml, $encoding) = $this->parseFile($resource); - $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2'); - $catalogue = new MessageCatalogue($locale); + $this->extract($resource, $catalogue, $domain); + + if (class_exists('Symfony\Component\Config\Resource\FileResource')) { + $catalogue->addResource(new FileResource($resource)); + } + + return $catalogue; + } + + private function extract($resource, MessageCatalogue $catalogue, $domain) + { + try { + $dom = XmlUtils::loadFile($resource); + } catch (\InvalidArgumentException $e) { + throw new InvalidResourceException(sprintf('Unable to load "%s": %s', $resource, $e->getMessage()), $e->getCode(), $e); + } + + $xliffVersion = $this->getVersionNumber($dom); + $this->validateSchema($xliffVersion, $dom, $this->getSchema($xliffVersion)); + + if ('1.2' === $xliffVersion) { + $this->extractXliff1($dom, $catalogue, $domain); + } + + if ('2.0' === $xliffVersion) { + $this->extractXliff2($dom, $catalogue, $domain); + } + } + + /** + * Extract messages and metadata from DOMDocument into a MessageCatalogue. + * + * @param \DOMDocument $dom Source to extract messages and metadata + * @param MessageCatalogue $catalogue Catalogue where we'll collect messages and metadata + * @param string $domain The domain + */ + private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, $domain) + { + $xml = simplexml_import_dom($dom); + $encoding = strtoupper($dom->encoding); + + $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2'); foreach ($xml->xpath('//xliff:trans-unit') as $translation) { $attributes = $translation->attributes(); @@ -55,31 +94,52 @@ public function load($resource, $locale, $domain = 'messages') $catalogue->set((string) $source, $target, $domain); - if (isset($translation->note)) { - $notes = array(); - foreach ($translation->note as $xmlNote) { - $noteAttributes = $xmlNote->attributes(); - $note = array('content' => $this->utf8ToCharset((string) $xmlNote, $encoding)); - if (isset($noteAttributes['priority'])) { - $note['priority'] = (int) $noteAttributes['priority']; - } + $metadata = array(); + if ($notes = $this->parseNotesMetadata($translation->note, $encoding)) { + $metadata['notes'] = $notes; + } + if (isset($translation->target) && $translation->target->attributes()) { + $metadata['target-attributes'] = array(); + foreach ($translation->target->attributes() as $key => $value) { + $metadata['target-attributes'][$key] = (string) $value; + } + } - if (isset($noteAttributes['from'])) { - $note['from'] = (string) $noteAttributes['from']; - } + $catalogue->setMetadata((string) $source, $metadata, $domain); + } + } - $notes[] = $note; - } + /** + * @param \DOMDocument $dom + * @param MessageCatalogue $catalogue + * @param string $domain + */ + private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, $domain) + { + $xml = simplexml_import_dom($dom); + $encoding = strtoupper($dom->encoding); + + $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:2.0'); + + foreach ($xml->xpath('//xliff:unit/xliff:segment') as $segment) { + $source = $segment->source; - $catalogue->setMetadata((string) $source, array('notes' => $notes), $domain); + // If the xlf file has another encoding specified, try to convert it because + // simple_xml will always return utf-8 encoded values + $target = $this->utf8ToCharset((string) (isset($segment->target) ? $segment->target : $source), $encoding); + + $catalogue->set((string) $source, $target, $domain); + + $metadata = array(); + if (isset($segment->target) && $segment->target->attributes()) { + $metadata['target-attributes'] = array(); + foreach ($segment->target->attributes() as $key => $value) { + $metadata['target-attributes'][$key] = (string) $value; + } } - } - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); + $catalogue->setMetadata((string) $source, $metadata, $domain); } - - return $catalogue; } /** @@ -93,57 +153,24 @@ public function load($resource, $locale, $domain = 'messages') private function utf8ToCharset($content, $encoding = null) { if ('UTF-8' !== $encoding && !empty($encoding)) { - if (function_exists('mb_convert_encoding')) { - return mb_convert_encoding($content, $encoding, 'UTF-8'); - } - - if (function_exists('iconv')) { - return iconv('UTF-8', $encoding, $content); - } - - throw new \RuntimeException('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).'); + return mb_convert_encoding($content, $encoding, 'UTF-8'); } return $content; } /** - * Validates and parses the given file into a SimpleXMLElement. - * - * @param string $file - * - * @throws \RuntimeException - * - * @return \SimpleXMLElement + * @param string $file + * @param \DOMDocument $dom + * @param string $schema source of the schema * * @throws InvalidResourceException */ - private function parseFile($file) + private function validateSchema($file, \DOMDocument $dom, $schema) { - try { - $dom = XmlUtils::loadFile($file); - } catch (\InvalidArgumentException $e) { - throw new InvalidResourceException(sprintf('Unable to load "%s": %s', $file, $e->getMessage()), $e->getCode(), $e); - } - $internalErrors = libxml_use_internal_errors(true); - $location = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd'; - $parts = explode('/', $location); - if (0 === stripos($location, 'phar://')) { - $tmpfile = tempnam(sys_get_temp_dir(), 'sf2'); - if ($tmpfile) { - copy($location, $tmpfile); - $parts = explode('/', str_replace('\\', '/', $tmpfile)); - } - } - $drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : ''; - $location = 'file:///'.$drive.implode('/', array_map('rawurlencode', $parts)); - - $source = file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-1.2-strict.xsd'); - $source = str_replace('http://www.w3.org/2001/xml.xsd', $location, $source); - - if (!@$dom->schemaValidateSource($source)) { + if (!@$dom->schemaValidateSource($schema)) { throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors)))); } @@ -151,8 +178,46 @@ private function parseFile($file) libxml_clear_errors(); libxml_use_internal_errors($internalErrors); + } - return array(simplexml_import_dom($dom), strtoupper($dom->encoding)); + private function getSchema($xliffVersion) + { + if ('1.2' === $xliffVersion) { + $schemaSource = file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-1.2-strict.xsd'); + $xmlUri = 'http://www.w3.org/2001/xml.xsd'; + } elseif ('2.0' === $xliffVersion) { + $schemaSource = file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-2.0.xsd'); + $xmlUri = 'informativeCopiesOf3rdPartySchemas/w3c/xml.xsd'; + } else { + throw new \InvalidArgumentException(sprintf('No support implemented for loading XLIFF version "%s".', $xliffVersion)); + } + + return $this->fixXmlLocation($schemaSource, $xmlUri); + } + + /** + * Internally changes the URI of a dependent xsd to be loaded locally. + * + * @param string $schemaSource Current content of schema file + * @param string $xmlUri External URI of XML to convert to local + * + * @return string + */ + private function fixXmlLocation($schemaSource, $xmlUri) + { + $newPath = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd'; + $parts = explode('/', $newPath); + if (0 === stripos($newPath, 'phar://')) { + $tmpfile = tempnam(sys_get_temp_dir(), 'sf2'); + if ($tmpfile) { + copy($newPath, $tmpfile); + $parts = explode('/', str_replace('\\', '/', $tmpfile)); + } + } + $drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : ''; + $newPath = 'file:///'.$drive.implode('/', array_map('rawurlencode', $parts)); + + return str_replace($xmlUri, $newPath, $schemaSource); } /** @@ -181,4 +246,68 @@ private function getXmlErrors($internalErrors) return $errors; } + + /** + * Gets xliff file version based on the root "version" attribute. + * Defaults to 1.2 for backwards compatibility. + * + * @param \DOMDocument $dom + * + * @throws \InvalidArgumentException + * + * @return string + */ + private function getVersionNumber(\DOMDocument $dom) + { + /** @var \DOMNode $xliff */ + foreach ($dom->getElementsByTagName('xliff') as $xliff) { + $version = $xliff->attributes->getNamedItem('version'); + if ($version) { + return $version->nodeValue; + } + + $namespace = $xliff->attributes->getNamedItem('xmlns'); + if ($namespace) { + if (substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34) !== 0) { + throw new \InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s"', $namespace)); + } + + return substr($namespace, 34); + } + } + + // Falls back to v1.2 + return '1.2'; + } + + /* + * @param \SimpleXMLElement|null $noteElement + * @param string|null $encoding + * + * @return array + */ + private function parseNotesMetadata(\SimpleXMLElement $noteElement = null, $encoding = null) + { + $notes = array(); + + if (null === $noteElement) { + return $notes; + } + + foreach ($noteElement as $xmlNote) { + $noteAttributes = $xmlNote->attributes(); + $note = array('content' => $this->utf8ToCharset((string) $xmlNote, $encoding)); + if (isset($noteAttributes['priority'])) { + $note['priority'] = (int) $noteAttributes['priority']; + } + + if (isset($noteAttributes['from'])) { + $note['from'] = (string) $noteAttributes['from']; + } + + $notes[] = $note; + } + + return $notes; + } } diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/vendor/symfony/translation/Loader/YamlFileLoader.php index a34cf05..5d9a3ad 100644 --- a/vendor/symfony/translation/Loader/YamlFileLoader.php +++ b/vendor/symfony/translation/Loader/YamlFileLoader.php @@ -12,8 +12,6 @@ namespace Symfony\Component\Translation\Loader; use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\Yaml\Parser as YamlParser; use Symfony\Component\Yaml\Exception\ParseException; @@ -22,28 +20,20 @@ * * @author Fabien Potencier */ -class YamlFileLoader extends ArrayLoader +class YamlFileLoader extends FileLoader { private $yamlParser; /** * {@inheritdoc} */ - public function load($resource, $locale, $domain = 'messages') + protected function loadResource($resource) { - if (!stream_is_local($resource)) { - throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource)); - } - - if (!file_exists($resource)) { - throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); - } - - if (!class_exists('Symfony\Component\Yaml\Parser')) { - throw new \LogicException('Loading translations from the YAML format requires the Symfony Yaml component.'); - } - if (null === $this->yamlParser) { + if (!class_exists('Symfony\Component\Yaml\Parser')) { + throw new \LogicException('Loading translations from the YAML format requires the Symfony Yaml component.'); + } + $this->yamlParser = new YamlParser(); } @@ -53,22 +43,6 @@ public function load($resource, $locale, $domain = 'messages') throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e); } - // empty file - if (null === $messages) { - $messages = array(); - } - - // not an array - if (!is_array($messages)) { - throw new InvalidResourceException(sprintf('The file "%s" must contain a YAML array.', $resource)); - } - - $catalogue = parent::load($messages, $locale, $domain); - - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { - $catalogue->addResource(new FileResource($resource)); - } - - return $catalogue; + return $messages; } } diff --git a/vendor/symfony/translation/Loader/schema/dic/xliff-core/xliff-core-2.0.xsd b/vendor/symfony/translation/Loader/schema/dic/xliff-core/xliff-core-2.0.xsd new file mode 100644 index 0000000..963232f --- /dev/null +++ b/vendor/symfony/translation/Loader/schema/dic/xliff-core/xliff-core-2.0.xsd @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendor/symfony/translation/PluralizationRules.php b/vendor/symfony/translation/PluralizationRules.php index f250423..0974821 100644 --- a/vendor/symfony/translation/PluralizationRules.php +++ b/vendor/symfony/translation/PluralizationRules.php @@ -131,6 +131,7 @@ public static function get($number, $locale) case 'fr': case 'gun': case 'hi': + case 'hy': case 'ln': case 'mg': case 'nso': diff --git a/vendor/symfony/translation/README.md b/vendor/symfony/translation/README.md index 2b46b51..984f40d 100644 --- a/vendor/symfony/translation/README.md +++ b/vendor/symfony/translation/README.md @@ -28,7 +28,7 @@ https://github.com/silexphp/Silex/blob/master/src/Silex/Provider/TranslationServ Documentation: -https://symfony.com/doc/2.7/book/translation.html +https://symfony.com/doc/2.8/book/translation.html You can run the unit tests with the following command: diff --git a/vendor/symfony/translation/Translator.php b/vendor/symfony/translation/Translator.php index c6d8c16..ef8c7be 100644 --- a/vendor/symfony/translation/Translator.php +++ b/vendor/symfony/translation/Translator.php @@ -267,9 +267,13 @@ protected function getLoaders() * @param string|null $locale Locale of translations, by default is current locale * * @return array[array] indexed by catalog + * + * @deprecated since version 2.8, to be removed in 3.0. Use TranslatorBagInterface::getCatalogue() method instead. */ public function getMessages($locale = null) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use TranslatorBagInterface::getCatalogue() method instead.', E_USER_DEPRECATED); + $catalogue = $this->getCatalogue($locale); $messages = $catalogue->all(); while ($catalogue = $catalogue->getFallbackCatalogue()) { diff --git a/vendor/symfony/translation/Util/ArrayConverter.php b/vendor/symfony/translation/Util/ArrayConverter.php new file mode 100644 index 0000000..60a55e9 --- /dev/null +++ b/vendor/symfony/translation/Util/ArrayConverter.php @@ -0,0 +1,99 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Translation\Util; + +/** + * ArrayConverter generates tree like structure from a message catalogue. + * e.g. this + * 'foo.bar1' => 'test1', + * 'foo.bar2' => 'test2' + * converts to follows: + * foo: + * bar1: test1 + * bar2: test2. + * + * @author Gennady Telegin + */ +class ArrayConverter +{ + /** + * Converts linear messages array to tree-like array. + * For example this rray('foo.bar' => 'value') will be converted to array('foo' => array('bar' => 'value')). + * + * @param array $messages Linear messages array + * + * @return array Tree-like messages array + */ + public static function expandToTree(array $messages) + { + $tree = array(); + + foreach ($messages as $id => $value) { + $referenceToElement = &self::getElementByPath($tree, explode('.', $id)); + + $referenceToElement = $value; + + unset($referenceToElement); + } + + return $tree; + } + + private static function &getElementByPath(array &$tree, array $parts) + { + $elem = &$tree; + $parentOfElem = null; + + foreach ($parts as $i => $part) { + if (isset($elem[$part]) && is_string($elem[$part])) { + /* Process next case: + * 'foo': 'test1', + * 'foo.bar': 'test2' + * + * $tree['foo'] was string before we found array {bar: test2}. + * Treat new element as string too, e.g. add $tree['foo.bar'] = 'test2'; + */ + $elem = &$elem[ implode('.', array_slice($parts, $i)) ]; + break; + } + $parentOfElem = &$elem; + $elem = &$elem[$part]; + } + + if (is_array($elem) && count($elem) > 0 && $parentOfElem) { + /* Process next case: + * 'foo.bar': 'test1' + * 'foo': 'test2' + * + * $tree['foo'] was array = {bar: 'test1'} before we found string constant `foo`. + * Cancel treating $tree['foo'] as array and cancel back it expansion, + * e.g. make it $tree['foo.bar'] = 'test1' again. + */ + self::cancelExpand($parentOfElem, $part, $elem); + } + + return $elem; + } + + private static function cancelExpand(array &$tree, $prefix, array $node) + { + $prefix .= '.'; + + foreach ($node as $id => $value) { + if (is_string($value)) { + $tree[$prefix.$id] = $value; + } else { + self::cancelExpand($tree, $prefix.$id, $value); + } + } + } +} diff --git a/vendor/symfony/translation/composer.json b/vendor/symfony/translation/composer.json index ac833a4..79ff646 100644 --- a/vendor/symfony/translation/composer.json +++ b/vendor/symfony/translation/composer.json @@ -16,12 +16,13 @@ } ], "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/config": "~2.7", - "symfony/intl": "~2.4", - "symfony/yaml": "~2.2", + "symfony/config": "~2.8", + "symfony/intl": "~2.4|~3.0.0", + "symfony/yaml": "~2.2|~3.0.0", "psr/log": "~1.0" }, "conflict": { @@ -33,12 +34,15 @@ "psr/log": "To use logging capability in translator" }, "autoload": { - "psr-4": { "Symfony\\Component\\Translation\\": "" } + "psr-4": { "Symfony\\Component\\Translation\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/translation/phpunit.xml.dist b/vendor/symfony/translation/phpunit.xml.dist index 16cca4a..c25ec5e 100644 --- a/vendor/symfony/translation/phpunit.xml.dist +++ b/vendor/symfony/translation/phpunit.xml.dist @@ -20,8 +20,8 @@ ./ - ./vendor ./Tests + ./vendor diff --git a/vendor/symfony/validator/CHANGELOG.md b/vendor/symfony/validator/CHANGELOG.md index 4531286..0ff667b 100644 --- a/vendor/symfony/validator/CHANGELOG.md +++ b/vendor/symfony/validator/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.8.0 +----- + + * added the BIC (SWIFT-Code) validator + 2.7.0 ----- diff --git a/vendor/symfony/validator/ConstraintViolationInterface.php b/vendor/symfony/validator/ConstraintViolationInterface.php index 1ed09b3..eff79b6 100644 --- a/vendor/symfony/validator/ConstraintViolationInterface.php +++ b/vendor/symfony/validator/ConstraintViolationInterface.php @@ -120,7 +120,7 @@ public function getInvalidValue(); /** * Returns a machine-digestible error code for the violation. * - * @return mixed The error code. + * @return string|null The error code. */ public function getCode(); } diff --git a/vendor/symfony/validator/Constraints/AbstractComparison.php b/vendor/symfony/validator/Constraints/AbstractComparison.php index fb1f1f3..78db943 100644 --- a/vendor/symfony/validator/Constraints/AbstractComparison.php +++ b/vendor/symfony/validator/Constraints/AbstractComparison.php @@ -18,6 +18,7 @@ * Used for the comparison of values. * * @author Daniel Holmes + * @author Bernhard Schussek */ abstract class AbstractComparison extends Constraint { diff --git a/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php b/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php index 67d73a5..ce04874 100644 --- a/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php +++ b/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php @@ -60,12 +60,14 @@ public function validate($value, Constraint $constraint) ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE)) ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE)) ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue)) + ->setCode($this->getErrorCode()) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE)) ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE)) ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue)) + ->setCode($this->getErrorCode()) ->addViolation(); } } @@ -80,4 +82,13 @@ public function validate($value, Constraint $constraint) * @return bool true if the relationship is valid, false otherwise */ abstract protected function compareValues($value1, $value2); + + /** + * Returns the error code used if the comparison fails. + * + * @return string|null The error code or `null` if no code should be set + */ + protected function getErrorCode() + { + } } diff --git a/vendor/symfony/validator/Constraints/Bic.php b/vendor/symfony/validator/Constraints/Bic.php new file mode 100644 index 0000000..dee5d52 --- /dev/null +++ b/vendor/symfony/validator/Constraints/Bic.php @@ -0,0 +1,39 @@ + + * + * 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; + +/** + * @Annotation + * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) + * + * @author Michael Hirschler + */ +class Bic extends Constraint +{ + const INVALID_LENGTH_ERROR = '66dad313-af0b-4214-8566-6c799be9789c'; + const INVALID_CHARACTERS_ERROR = 'f424c529-7add-4417-8f2d-4b656e4833e2'; + const INVALID_BANK_CODE_ERROR = '00559357-6170-4f29-aebd-d19330aa19cf'; + const INVALID_COUNTRY_CODE_ERROR = '1ce76f8d-3c1f-451c-9e62-fe9c3ed486ae'; + const INVALID_CASE_ERROR = '11884038-3312-4ae5-9d04-699f782130c7'; + + protected static $errorNames = array( + self::INVALID_LENGTH_ERROR => 'INVALID_LENGTH_ERROR', + self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR', + self::INVALID_BANK_CODE_ERROR => 'INVALID_BANK_CODE_ERROR', + self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR', + self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR', + ); + + public $message = 'This is not a valid Business Identifier Code (BIC).'; +} diff --git a/vendor/symfony/validator/Constraints/BicValidator.php b/vendor/symfony/validator/Constraints/BicValidator.php new file mode 100644 index 0000000..de32708 --- /dev/null +++ b/vendor/symfony/validator/Constraints/BicValidator.php @@ -0,0 +1,75 @@ + + * + * 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\ConstraintValidator; + +/** + * @author Michael Hirschler + * + * @link https://en.wikipedia.org/wiki/ISO_9362#Structure + */ +class BicValidator extends ConstraintValidator +{ + /** + * {@inheritdoc} + */ + public function validate($value, Constraint $constraint) + { + if (null === $value || '' === $value) { + return; + } + + $canonicalize = str_replace(' ', '', $value); + + // the bic must be either 8 or 11 characters long + if (!in_array(strlen($canonicalize), array(8, 11))) { + $this->context->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Bic::INVALID_LENGTH_ERROR) + ->addViolation(); + } + + // must contain alphanumeric values only + if (!ctype_alnum($canonicalize)) { + $this->context->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Bic::INVALID_CHARACTERS_ERROR) + ->addViolation(); + } + + // first 4 letters must be alphabetic (bank code) + if (!ctype_alpha(substr($canonicalize, 0, 4))) { + $this->context->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Bic::INVALID_BANK_CODE_ERROR) + ->addViolation(); + } + + // next 2 letters must be alphabetic (country code) + if (!ctype_alpha(substr($canonicalize, 4, 2))) { + $this->context->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Bic::INVALID_COUNTRY_CODE_ERROR) + ->addViolation(); + } + + // should contain uppercase characters only + if (strtoupper($canonicalize) !== $canonicalize) { + $this->context->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Bic::INVALID_CASE_ERROR) + ->addViolation(); + } + } +} diff --git a/vendor/symfony/validator/Constraints/Blank.php b/vendor/symfony/validator/Constraints/Blank.php index ad93c74..030b21f 100644 --- a/vendor/symfony/validator/Constraints/Blank.php +++ b/vendor/symfony/validator/Constraints/Blank.php @@ -21,5 +21,11 @@ */ class Blank extends Constraint { + const NOT_BLANK_ERROR = '183ad2de-533d-4796-a439-6d3c3852b549'; + + protected static $errorNames = array( + self::NOT_BLANK_ERROR => 'NOT_BLANK_ERROR', + ); + public $message = 'This value should be blank.'; } diff --git a/vendor/symfony/validator/Constraints/BlankValidator.php b/vendor/symfony/validator/Constraints/BlankValidator.php index de4b49b..4b9fd3d 100644 --- a/vendor/symfony/validator/Constraints/BlankValidator.php +++ b/vendor/symfony/validator/Constraints/BlankValidator.php @@ -34,10 +34,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Blank::NOT_BLANK_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Blank::NOT_BLANK_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/CardScheme.php b/vendor/symfony/validator/Constraints/CardScheme.php index 14f3b5d..40c32e8 100644 --- a/vendor/symfony/validator/Constraints/CardScheme.php +++ b/vendor/symfony/validator/Constraints/CardScheme.php @@ -24,8 +24,8 @@ */ class CardScheme extends Constraint { - const NOT_NUMERIC_ERROR = 1; - const INVALID_FORMAT_ERROR = 2; + const NOT_NUMERIC_ERROR = 'a2ad9231-e827-485f-8a1e-ef4d9a6d5c2e'; + const INVALID_FORMAT_ERROR = 'a8faedbf-1c2f-4695-8d22-55783be8efed'; protected static $errorNames = array( self::NOT_NUMERIC_ERROR => 'NOT_NUMERIC_ERROR', diff --git a/vendor/symfony/validator/Constraints/Choice.php b/vendor/symfony/validator/Constraints/Choice.php index 4e2c8e7..4b93c70 100644 --- a/vendor/symfony/validator/Constraints/Choice.php +++ b/vendor/symfony/validator/Constraints/Choice.php @@ -21,9 +21,9 @@ */ class Choice extends Constraint { - const NO_SUCH_CHOICE_ERROR = 1; - const TOO_FEW_ERROR = 2; - const TOO_MANY_ERROR = 3; + const NO_SUCH_CHOICE_ERROR = '8e179f1b-97aa-4560-a02f-2a8b42e49df7'; + const TOO_FEW_ERROR = '11edd7eb-5872-4b6e-9f12-89923999fd0e'; + const TOO_MANY_ERROR = '9bd98e49-211c-433f-8630-fd1c2d0f08c3'; protected static $errorNames = array( self::NO_SUCH_CHOICE_ERROR => 'NO_SUCH_CHOICE_ERROR', diff --git a/vendor/symfony/validator/Constraints/Collection.php b/vendor/symfony/validator/Constraints/Collection.php index ae55366..ac1edd3 100644 --- a/vendor/symfony/validator/Constraints/Collection.php +++ b/vendor/symfony/validator/Constraints/Collection.php @@ -21,8 +21,8 @@ */ class Collection extends Composite { - const MISSING_FIELD_ERROR = 1; - const NO_SUCH_FIELD_ERROR = 2; + const MISSING_FIELD_ERROR = '2fa2158c-2a7f-484b-98aa-975522539ff8'; + const NO_SUCH_FIELD_ERROR = '7703c766-b5d5-4cef-ace7-ae0dd82304e9'; protected static $errorNames = array( self::MISSING_FIELD_ERROR => 'MISSING_FIELD_ERROR', diff --git a/vendor/symfony/validator/Constraints/Count.php b/vendor/symfony/validator/Constraints/Count.php index 3378227..53870fb 100644 --- a/vendor/symfony/validator/Constraints/Count.php +++ b/vendor/symfony/validator/Constraints/Count.php @@ -22,8 +22,8 @@ */ class Count extends Constraint { - const TOO_FEW_ERROR = 1; - const TOO_MANY_ERROR = 2; + const TOO_FEW_ERROR = 'bef8e338-6ae5-4caf-b8e2-50e7b0579e69'; + const TOO_MANY_ERROR = '756b1212-697c-468d-a9ad-50dd783bb169'; protected static $errorNames = array( self::TOO_FEW_ERROR => 'TOO_FEW_ERROR', diff --git a/vendor/symfony/validator/Constraints/Country.php b/vendor/symfony/validator/Constraints/Country.php index d1df3a8..1b76570 100644 --- a/vendor/symfony/validator/Constraints/Country.php +++ b/vendor/symfony/validator/Constraints/Country.php @@ -21,5 +21,11 @@ */ class Country extends Constraint { + const NO_SUCH_COUNTRY_ERROR = '8f900c12-61bd-455d-9398-996cd040f7f0'; + + protected static $errorNames = array( + self::NO_SUCH_COUNTRY_ERROR => 'NO_SUCH_COUNTRY_ERROR', + ); + public $message = 'This value is not a valid country.'; } diff --git a/vendor/symfony/validator/Constraints/CountryValidator.php b/vendor/symfony/validator/Constraints/CountryValidator.php index 22b7909..138d775 100644 --- a/vendor/symfony/validator/Constraints/CountryValidator.php +++ b/vendor/symfony/validator/Constraints/CountryValidator.php @@ -48,10 +48,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Country::NO_SUCH_COUNTRY_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Country::NO_SUCH_COUNTRY_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Currency.php b/vendor/symfony/validator/Constraints/Currency.php index 736af83..d28f94c 100644 --- a/vendor/symfony/validator/Constraints/Currency.php +++ b/vendor/symfony/validator/Constraints/Currency.php @@ -18,8 +18,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Miha Vrhovnik + * @author Bernhard Schussek */ class Currency extends Constraint { + const NO_SUCH_CURRENCY_ERROR = '69945ac1-2db4-405f-bec7-d2772f73df52'; + + protected static $errorNames = array( + self::NO_SUCH_CURRENCY_ERROR => 'NO_SUCH_CURRENCY_ERROR', + ); + public $message = 'This value is not a valid currency.'; } diff --git a/vendor/symfony/validator/Constraints/CurrencyValidator.php b/vendor/symfony/validator/Constraints/CurrencyValidator.php index 4fa91d5..043bafa 100644 --- a/vendor/symfony/validator/Constraints/CurrencyValidator.php +++ b/vendor/symfony/validator/Constraints/CurrencyValidator.php @@ -21,6 +21,7 @@ * Validates whether a value is a valid currency. * * @author Miha Vrhovnik + * @author Bernhard Schussek */ class CurrencyValidator extends ConstraintValidator { @@ -48,10 +49,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Currency::NO_SUCH_CURRENCY_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Currency::NO_SUCH_CURRENCY_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Date.php b/vendor/symfony/validator/Constraints/Date.php index 1001d78..2563413 100644 --- a/vendor/symfony/validator/Constraints/Date.php +++ b/vendor/symfony/validator/Constraints/Date.php @@ -21,8 +21,8 @@ */ class Date extends Constraint { - const INVALID_FORMAT_ERROR = 1; - const INVALID_DATE_ERROR = 2; + const INVALID_FORMAT_ERROR = '69819696-02ac-4a99-9ff0-14e127c4d1bc'; + const INVALID_DATE_ERROR = '3c184ce5-b31d-4de7-8b76-326da7b2be93'; protected static $errorNames = array( self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR', diff --git a/vendor/symfony/validator/Constraints/DateTime.php b/vendor/symfony/validator/Constraints/DateTime.php index a71bbbd..35e2934 100644 --- a/vendor/symfony/validator/Constraints/DateTime.php +++ b/vendor/symfony/validator/Constraints/DateTime.php @@ -21,9 +21,9 @@ */ class DateTime extends Constraint { - const INVALID_FORMAT_ERROR = 1; - const INVALID_DATE_ERROR = 2; - const INVALID_TIME_ERROR = 3; + const INVALID_FORMAT_ERROR = '1a9da513-2640-4f84-9b6a-4d99dcddc628'; + const INVALID_DATE_ERROR = 'd52afa47-620d-4d99-9f08-f4d85b36e33c'; + const INVALID_TIME_ERROR = '5e797c9d-74f7-4098-baa3-94390c447b27'; protected static $errorNames = array( self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR', diff --git a/vendor/symfony/validator/Constraints/Email.php b/vendor/symfony/validator/Constraints/Email.php index 96abf2c..a9d9ab1 100644 --- a/vendor/symfony/validator/Constraints/Email.php +++ b/vendor/symfony/validator/Constraints/Email.php @@ -21,9 +21,9 @@ */ class Email extends Constraint { - const INVALID_FORMAT_ERROR = 1; - const MX_CHECK_FAILED_ERROR = 2; - const HOST_CHECK_FAILED_ERROR = 3; + const INVALID_FORMAT_ERROR = 'bd79c0ab-ddba-46cc-a703-a7a4b08de310'; + const MX_CHECK_FAILED_ERROR = 'bf447c1c-0266-4e10-9c6c-573df282e413'; + const HOST_CHECK_FAILED_ERROR = '7da53a8b-56f3-4288-bb3e-ee9ede4ef9a1'; protected static $errorNames = array( self::INVALID_FORMAT_ERROR => 'STRICT_CHECK_FAILED_ERROR', diff --git a/vendor/symfony/validator/Constraints/EqualTo.php b/vendor/symfony/validator/Constraints/EqualTo.php index 8d3d752..4b22c6d 100644 --- a/vendor/symfony/validator/Constraints/EqualTo.php +++ b/vendor/symfony/validator/Constraints/EqualTo.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class EqualTo extends AbstractComparison { + const NOT_EQUAL_ERROR = '478618a7-95ba-473d-9101-cabd45e49115'; + + protected static $errorNames = array( + self::NOT_EQUAL_ERROR => 'NOT_EQUAL_ERROR', + ); + public $message = 'This value should be equal to {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/EqualToValidator.php b/vendor/symfony/validator/Constraints/EqualToValidator.php index 3739dbe..fe1f362 100644 --- a/vendor/symfony/validator/Constraints/EqualToValidator.php +++ b/vendor/symfony/validator/Constraints/EqualToValidator.php @@ -15,6 +15,7 @@ * Validates values are equal (==). * * @author Daniel Holmes + * @author Bernhard Schussek */ class EqualToValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 == $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return EqualTo::NOT_EQUAL_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/Expression.php b/vendor/symfony/validator/Constraints/Expression.php index dfa242c..3329bd2 100644 --- a/vendor/symfony/validator/Constraints/Expression.php +++ b/vendor/symfony/validator/Constraints/Expression.php @@ -22,6 +22,12 @@ */ class Expression extends Constraint { + const EXPRESSION_FAILED_ERROR = '6b3befbc-2f01-4ddf-be21-b57898905284'; + + protected static $errorNames = array( + self::EXPRESSION_FAILED_ERROR => 'EXPRESSION_FAILED_ERROR', + ); + public $message = 'This value is not valid.'; public $expression; diff --git a/vendor/symfony/validator/Constraints/ExpressionValidator.php b/vendor/symfony/validator/Constraints/ExpressionValidator.php index 15d51f9..8cc289b 100644 --- a/vendor/symfony/validator/Constraints/ExpressionValidator.php +++ b/vendor/symfony/validator/Constraints/ExpressionValidator.php @@ -37,18 +37,10 @@ class ExpressionValidator extends ConstraintValidator */ private $expressionLanguage; - /** - * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5 - * - * @throws UnexpectedTypeException If the property accessor is invalid - */ - public function __construct($propertyAccessor = null) + public function __construct(PropertyAccessorInterface $propertyAccessor = null, ExpressionLanguage $expressionLanguage = null) { - if (null !== $propertyAccessor && !$propertyAccessor instanceof PropertyAccessorInterface) { - throw new UnexpectedTypeException($propertyAccessor, 'null or \Symfony\Component\PropertyAccess\PropertyAccessorInterface'); - } - $this->propertyAccessor = $propertyAccessor; + $this->expressionLanguage = $expressionLanguage; } /** @@ -88,10 +80,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Expression::EXPRESSION_FAILED_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Expression::EXPRESSION_FAILED_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/File.php b/vendor/symfony/validator/Constraints/File.php index de9fc00..24c7495 100644 --- a/vendor/symfony/validator/Constraints/File.php +++ b/vendor/symfony/validator/Constraints/File.php @@ -24,11 +24,11 @@ class File extends Constraint { // 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; + const NOT_FOUND_ERROR = 'd2a3fb6e-7ddc-4210-8fbf-2ab345ce1998'; + const NOT_READABLE_ERROR = 'c20c92a4-5bfa-4202-9477-28e800e0f6ff'; + const EMPTY_ERROR = '5d743385-9775-4aa5-8ff5-495fb1e60137'; + const TOO_LARGE_ERROR = 'df8637af-d466-48c6-a59d-e7126250a654'; + const INVALID_MIME_TYPE_ERROR = '744f00bc-4389-4c74-92de-9a43cde55534'; protected static $errorNames = array( self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR', diff --git a/vendor/symfony/validator/Constraints/GreaterThan.php b/vendor/symfony/validator/Constraints/GreaterThan.php index ec7fafb..c2ca2dc 100644 --- a/vendor/symfony/validator/Constraints/GreaterThan.php +++ b/vendor/symfony/validator/Constraints/GreaterThan.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class GreaterThan extends AbstractComparison { + const TOO_LOW_ERROR = '778b7ae0-84d3-481a-9dec-35fdb64b1d78'; + + protected static $errorNames = array( + self::TOO_LOW_ERROR => 'TOO_LOW_ERROR', + ); + public $message = 'This value should be greater than {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php b/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php index 36fdd9c..9b3743d 100644 --- a/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php +++ b/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class GreaterThanOrEqual extends AbstractComparison { + const TOO_LOW_ERROR = 'ea4e51d1-3342-48bd-87f1-9e672cd90cad'; + + protected static $errorNames = array( + self::TOO_LOW_ERROR => 'TOO_LOW_ERROR', + ); + public $message = 'This value should be greater than or equal to {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php b/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php index 2363204..e196e68 100644 --- a/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php +++ b/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php @@ -15,6 +15,7 @@ * Validates values are greater than or equal to the previous (>=). * * @author Daniel Holmes + * @author Bernhard Schussek */ class GreaterThanOrEqualValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 >= $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return GreaterThanOrEqual::TOO_LOW_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/GreaterThanValidator.php b/vendor/symfony/validator/Constraints/GreaterThanValidator.php index fdcf0c1..9029e8f 100644 --- a/vendor/symfony/validator/Constraints/GreaterThanValidator.php +++ b/vendor/symfony/validator/Constraints/GreaterThanValidator.php @@ -15,6 +15,7 @@ * Validates values are greater than the previous (>). * * @author Daniel Holmes + * @author Bernhard Schussek */ class GreaterThanValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 > $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return GreaterThan::TOO_LOW_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/GroupSequenceProvider.php b/vendor/symfony/validator/Constraints/GroupSequenceProvider.php index 3904473..8a3fe63 100644 --- a/vendor/symfony/validator/Constraints/GroupSequenceProvider.php +++ b/vendor/symfony/validator/Constraints/GroupSequenceProvider.php @@ -16,6 +16,8 @@ * * @Annotation * @Target({"CLASS", "ANNOTATION"}) + * + * @author Bernhard Schussek */ class GroupSequenceProvider { diff --git a/vendor/symfony/validator/Constraints/Iban.php b/vendor/symfony/validator/Constraints/Iban.php index c4dc985..9c4d383 100644 --- a/vendor/symfony/validator/Constraints/Iban.php +++ b/vendor/symfony/validator/Constraints/Iban.php @@ -24,14 +24,14 @@ class Iban extends Constraint { /** @deprecated, to be removed in 3.0. */ - const TOO_SHORT_ERROR = 1; - const INVALID_COUNTRY_CODE_ERROR = 2; - const INVALID_CHARACTERS_ERROR = 3; + const TOO_SHORT_ERROR = '88e5e319-0aeb-4979-a27e-3d9ce0c16166'; + const INVALID_COUNTRY_CODE_ERROR = 'de78ee2c-bd50-44e2-aec8-3d8228aeadb9'; + const INVALID_CHARACTERS_ERROR = '8d3d85e4-784f-4719-a5bc-d9e40d45a3a5'; /** @deprecated, to be removed in 3.0. */ - const INVALID_CASE_ERROR = 4; - const CHECKSUM_FAILED_ERROR = 5; - const INVALID_FORMAT_ERROR = 6; - const NOT_SUPPORTED_COUNTRY_CODE_ERROR = 7; + const INVALID_CASE_ERROR = 'f4bf62fe-03ec-42af-a53b-68e21b1e7274'; + const CHECKSUM_FAILED_ERROR = 'b9401321-f9bf-4dcb-83c1-f31094440795'; + const INVALID_FORMAT_ERROR = 'c8d318f1-2ecc-41ba-b983-df70d225cf5a'; + const NOT_SUPPORTED_COUNTRY_CODE_ERROR = 'e2c259f3-4b46-48e6-b72e-891658158ec8'; protected static $errorNames = array( self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR', diff --git a/vendor/symfony/validator/Constraints/IdenticalTo.php b/vendor/symfony/validator/Constraints/IdenticalTo.php index 6d00286..a7dadff 100644 --- a/vendor/symfony/validator/Constraints/IdenticalTo.php +++ b/vendor/symfony/validator/Constraints/IdenticalTo.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class IdenticalTo extends AbstractComparison { + const NOT_IDENTICAL_ERROR = '2a8cc50f-58a2-4536-875e-060a2ce69ed5'; + + protected static $errorNames = array( + self::NOT_IDENTICAL_ERROR => 'NOT_IDENTICAL_ERROR', + ); + public $message = 'This value should be identical to {{ compared_value_type }} {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/IdenticalToValidator.php b/vendor/symfony/validator/Constraints/IdenticalToValidator.php index a186726..304f71f 100644 --- a/vendor/symfony/validator/Constraints/IdenticalToValidator.php +++ b/vendor/symfony/validator/Constraints/IdenticalToValidator.php @@ -15,6 +15,7 @@ * Validates values are identical (===). * * @author Daniel Holmes + * @author Bernhard Schussek */ class IdenticalToValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 === $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return IdenticalTo::NOT_IDENTICAL_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/Image.php b/vendor/symfony/validator/Constraints/Image.php index f75c6a2..28803c4 100644 --- a/vendor/symfony/validator/Constraints/Image.php +++ b/vendor/symfony/validator/Constraints/Image.php @@ -20,18 +20,16 @@ */ 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; + const SIZE_NOT_DETECTED_ERROR = '6d55c3f4-e58e-4fe3-91ee-74b492199956'; + const TOO_WIDE_ERROR = '7f87163d-878f-47f5-99ba-a8eb723a1ab2'; + const TOO_NARROW_ERROR = '9afbd561-4f90-4a27-be62-1780fc43604a'; + const TOO_HIGH_ERROR = '7efae81c-4877-47ba-aa65-d01ccb0d4645'; + const TOO_LOW_ERROR = 'aef0cb6a-c07f-4894-bc08-1781420d7b4c'; + const RATIO_TOO_BIG_ERROR = '70cafca6-168f-41c9-8c8c-4e47a52be643'; + const RATIO_TOO_SMALL_ERROR = '59b8c6ef-bcf2-4ceb-afff-4642ed92f12e'; + const SQUARE_NOT_ALLOWED_ERROR = '5d41425b-facb-47f7-a55a-de9fbe45cb46'; + const LANDSCAPE_NOT_ALLOWED_ERROR = '6f895685-7cf2-4d65-b3da-9029c5581d88'; + const PORTRAIT_NOT_ALLOWED_ERROR = '65608156-77da-4c79-a88c-02ef6d18c782'; // Include the mapping from the base class diff --git a/vendor/symfony/validator/Constraints/Ip.php b/vendor/symfony/validator/Constraints/Ip.php index 8096502..36772c6 100644 --- a/vendor/symfony/validator/Constraints/Ip.php +++ b/vendor/symfony/validator/Constraints/Ip.php @@ -44,6 +44,8 @@ class Ip extends Constraint const V6_ONLY_PUBLIC = '6_public'; const ALL_ONLY_PUBLIC = 'all_public'; + const INVALID_IP_ERROR = 'b1b427ae-9f6f-41b0-aa9b-84511fbb3c5b'; + protected static $versions = array( self::V4, self::V6, @@ -62,6 +64,10 @@ class Ip extends Constraint self::ALL_ONLY_PUBLIC, ); + protected static $errorNames = array( + self::INVALID_IP_ERROR => 'INVALID_IP_ERROR', + ); + public $version = self::V4; public $message = 'This is not a valid IP address.'; diff --git a/vendor/symfony/validator/Constraints/IpValidator.php b/vendor/symfony/validator/Constraints/IpValidator.php index 0b17cf7..eb8642b 100644 --- a/vendor/symfony/validator/Constraints/IpValidator.php +++ b/vendor/symfony/validator/Constraints/IpValidator.php @@ -97,10 +97,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Ip::INVALID_IP_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Ip::INVALID_IP_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/IsFalse.php b/vendor/symfony/validator/Constraints/IsFalse.php index 71a0ed6..8332e18 100644 --- a/vendor/symfony/validator/Constraints/IsFalse.php +++ b/vendor/symfony/validator/Constraints/IsFalse.php @@ -21,5 +21,11 @@ */ class IsFalse extends Constraint { + const NOT_FALSE_ERROR = 'd53a91b0-def3-426a-83d7-269da7ab4200'; + + protected static $errorNames = array( + self::NOT_FALSE_ERROR => 'NOT_FALSE_ERROR', + ); + public $message = 'This value should be false.'; } diff --git a/vendor/symfony/validator/Constraints/IsFalseValidator.php b/vendor/symfony/validator/Constraints/IsFalseValidator.php index b78163b..522a1a2 100644 --- a/vendor/symfony/validator/Constraints/IsFalseValidator.php +++ b/vendor/symfony/validator/Constraints/IsFalseValidator.php @@ -37,10 +37,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(IsFalse::NOT_FALSE_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(IsFalse::NOT_FALSE_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/IsNull.php b/vendor/symfony/validator/Constraints/IsNull.php index 64e837a..fdd2930 100644 --- a/vendor/symfony/validator/Constraints/IsNull.php +++ b/vendor/symfony/validator/Constraints/IsNull.php @@ -21,5 +21,11 @@ */ class IsNull extends Constraint { + const NOT_NULL_ERROR = '60d2f30b-8cfa-4372-b155-9656634de120'; + + protected static $errorNames = array( + self::NOT_NULL_ERROR => 'NOT_NULL_ERROR', + ); + public $message = 'This value should be null.'; } diff --git a/vendor/symfony/validator/Constraints/IsNullValidator.php b/vendor/symfony/validator/Constraints/IsNullValidator.php index 5615121..1b7567f 100644 --- a/vendor/symfony/validator/Constraints/IsNullValidator.php +++ b/vendor/symfony/validator/Constraints/IsNullValidator.php @@ -34,10 +34,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(IsNull::NOT_NULL_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(IsNull::NOT_NULL_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/IsTrue.php b/vendor/symfony/validator/Constraints/IsTrue.php index 653135b..405a96a 100644 --- a/vendor/symfony/validator/Constraints/IsTrue.php +++ b/vendor/symfony/validator/Constraints/IsTrue.php @@ -21,5 +21,11 @@ */ class IsTrue extends Constraint { + const NOT_TRUE_ERROR = '2beabf1c-54c0-4882-a928-05249b26e23b'; + + protected static $errorNames = array( + self::NOT_TRUE_ERROR => 'NOT_TRUE_ERROR', + ); + public $message = 'This value should be true.'; } diff --git a/vendor/symfony/validator/Constraints/IsTrueValidator.php b/vendor/symfony/validator/Constraints/IsTrueValidator.php index 2882dd6..e1ca56e 100644 --- a/vendor/symfony/validator/Constraints/IsTrueValidator.php +++ b/vendor/symfony/validator/Constraints/IsTrueValidator.php @@ -38,10 +38,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(IsTrue::NOT_TRUE_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(IsTrue::NOT_TRUE_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Isbn.php b/vendor/symfony/validator/Constraints/Isbn.php index 3878c84..f1e83b9 100644 --- a/vendor/symfony/validator/Constraints/Isbn.php +++ b/vendor/symfony/validator/Constraints/Isbn.php @@ -23,11 +23,11 @@ */ 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; + const TOO_SHORT_ERROR = '949acbb0-8ef5-43ed-a0e9-032dfd08ae45'; + const TOO_LONG_ERROR = '3171387d-f80a-47b3-bd6e-60598545316a'; + const INVALID_CHARACTERS_ERROR = '23d21cea-da99-453d-98b1-a7d916fbb339'; + const CHECKSUM_FAILED_ERROR = '2881c032-660f-46b6-8153-d352d9706640'; + const TYPE_NOT_RECOGNIZED_ERROR = 'fa54a457-f042-441f-89c4-066ee5bdd3e1'; protected static $errorNames = array( self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR', diff --git a/vendor/symfony/validator/Constraints/Issn.php b/vendor/symfony/validator/Constraints/Issn.php index 39716a2..a2fecdd 100644 --- a/vendor/symfony/validator/Constraints/Issn.php +++ b/vendor/symfony/validator/Constraints/Issn.php @@ -22,12 +22,12 @@ */ 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; + const TOO_SHORT_ERROR = '6a20dd3d-f463-4460-8e7b-18a1b98abbfb'; + const TOO_LONG_ERROR = '37cef893-5871-464e-8b12-7fb79324833c'; + const MISSING_HYPHEN_ERROR = '2983286f-8134-4693-957a-1ec4ef887b15'; + const INVALID_CHARACTERS_ERROR = 'a663d266-37c2-4ece-a914-ae891940c588'; + const INVALID_CASE_ERROR = '7b6dd393-7523-4a6c-b84d-72b91bba5e1a'; + const CHECKSUM_FAILED_ERROR = 'b0f92dbc-667c-48de-b526-ad9586d43e85'; protected static $errorNames = array( self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR', diff --git a/vendor/symfony/validator/Constraints/Language.php b/vendor/symfony/validator/Constraints/Language.php index c6f513c..0e676b7 100644 --- a/vendor/symfony/validator/Constraints/Language.php +++ b/vendor/symfony/validator/Constraints/Language.php @@ -21,5 +21,11 @@ */ class Language extends Constraint { + const NO_SUCH_LANGUAGE_ERROR = 'ee65fec4-9a20-4202-9f39-ca558cd7bdf7'; + + protected static $errorNames = array( + self::NO_SUCH_LANGUAGE_ERROR => 'NO_SUCH_LANGUAGE_ERROR', + ); + public $message = 'This value is not a valid language.'; } diff --git a/vendor/symfony/validator/Constraints/LanguageValidator.php b/vendor/symfony/validator/Constraints/LanguageValidator.php index 1f514ab..19c1ba8 100644 --- a/vendor/symfony/validator/Constraints/LanguageValidator.php +++ b/vendor/symfony/validator/Constraints/LanguageValidator.php @@ -48,10 +48,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Language::NO_SUCH_LANGUAGE_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Language::NO_SUCH_LANGUAGE_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Length.php b/vendor/symfony/validator/Constraints/Length.php index bca4edb..0f96508 100644 --- a/vendor/symfony/validator/Constraints/Length.php +++ b/vendor/symfony/validator/Constraints/Length.php @@ -22,12 +22,14 @@ */ class Length extends Constraint { - const TOO_SHORT_ERROR = 1; - const TOO_LONG_ERROR = 2; + const TOO_SHORT_ERROR = '9ff3fdc4-b214-49db-8718-39c315e33d45'; + const TOO_LONG_ERROR = 'd94b19cc-114f-4f44-9cc4-4138e80a87b9'; + const INVALID_CHARACTERS_ERROR = '35e6a710-aa2e-4719-b58e-24b35749b767'; 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', ); 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.'; diff --git a/vendor/symfony/validator/Constraints/LengthValidator.php b/vendor/symfony/validator/Constraints/LengthValidator.php index d340749..9737495 100644 --- a/vendor/symfony/validator/Constraints/LengthValidator.php +++ b/vendor/symfony/validator/Constraints/LengthValidator.php @@ -42,29 +42,11 @@ public function validate($value, Constraint $constraint) $invalidCharset = false; if ('UTF8' === $charset = strtoupper($constraint->charset)) { - $charset = 'UTF-8'; + $charset = 'UTF-8'; // iconv on Windows requires "UTF-8" instead of "UTF8" } - if ('UTF-8' === $charset) { - if (!preg_match('//u', $stringValue)) { - $invalidCharset = true; - } elseif (function_exists('utf8_decode')) { - $length = strlen(utf8_decode($stringValue)); - } else { - preg_replace('/./u', '', $stringValue, -1, $length); - } - } elseif (function_exists('mb_strlen')) { - if (@mb_check_encoding($stringValue, $constraint->charset)) { - $length = mb_strlen($stringValue, $constraint->charset); - } else { - $invalidCharset = true; - } - } elseif (function_exists('iconv_strlen')) { - $length = @iconv_strlen($stringValue, $constraint->charset); - $invalidCharset = false === $length; - } else { - $length = strlen($stringValue); - } + $length = @iconv_strlen($stringValue, $charset); + $invalidCharset = false === $length; if ($invalidCharset) { if ($this->context instanceof ExecutionContextInterface) { @@ -72,12 +54,14 @@ public function validate($value, Constraint $constraint) ->setParameter('{{ value }}', $this->formatValue($stringValue)) ->setParameter('{{ charset }}', $constraint->charset) ->setInvalidValue($value) + ->setCode(Length::INVALID_CHARACTERS_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->charsetMessage) ->setParameter('{{ value }}', $this->formatValue($stringValue)) ->setParameter('{{ charset }}', $constraint->charset) ->setInvalidValue($value) + ->setCode(Length::INVALID_CHARACTERS_ERROR) ->addViolation(); } diff --git a/vendor/symfony/validator/Constraints/LessThan.php b/vendor/symfony/validator/Constraints/LessThan.php index b116320..1bbb508 100644 --- a/vendor/symfony/validator/Constraints/LessThan.php +++ b/vendor/symfony/validator/Constraints/LessThan.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class LessThan extends AbstractComparison { + const TOO_HIGH_ERROR = '079d7420-2d13-460c-8756-de810eeb37d2'; + + protected static $errorNames = array( + self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR', + ); + public $message = 'This value should be less than {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/LessThanOrEqual.php b/vendor/symfony/validator/Constraints/LessThanOrEqual.php index 7faca84..d118942 100644 --- a/vendor/symfony/validator/Constraints/LessThanOrEqual.php +++ b/vendor/symfony/validator/Constraints/LessThanOrEqual.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class LessThanOrEqual extends AbstractComparison { + const TOO_HIGH_ERROR = '079d7420-2d13-460c-8756-de810eeb37d2'; + + protected static $errorNames = array( + self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR', + ); + public $message = 'This value should be less than or equal to {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php b/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php index dcc93b2..54281ee 100644 --- a/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php +++ b/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php @@ -15,6 +15,7 @@ * Validates values are less than or equal to the previous (<=). * * @author Daniel Holmes + * @author Bernhard Schussek */ class LessThanOrEqualValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 <= $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return LessThanOrEqual::TOO_HIGH_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/LessThanValidator.php b/vendor/symfony/validator/Constraints/LessThanValidator.php index 081316a..ef7535f 100644 --- a/vendor/symfony/validator/Constraints/LessThanValidator.php +++ b/vendor/symfony/validator/Constraints/LessThanValidator.php @@ -15,6 +15,7 @@ * Validates values are less than the previous (<). * * @author Daniel Holmes + * @author Bernhard Schussek */ class LessThanValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 < $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return LessThan::TOO_HIGH_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/Locale.php b/vendor/symfony/validator/Constraints/Locale.php index cf30eb2..5aa7070 100644 --- a/vendor/symfony/validator/Constraints/Locale.php +++ b/vendor/symfony/validator/Constraints/Locale.php @@ -21,5 +21,11 @@ */ class Locale extends Constraint { + const NO_SUCH_LOCALE_ERROR = 'a0af4293-1f1a-4a1c-a328-979cba6182a2'; + + protected static $errorNames = array( + self::NO_SUCH_LOCALE_ERROR => 'NO_SUCH_LOCALE_ERROR', + ); + public $message = 'This value is not a valid locale.'; } diff --git a/vendor/symfony/validator/Constraints/LocaleValidator.php b/vendor/symfony/validator/Constraints/LocaleValidator.php index 038a1a4..aa4a99f 100644 --- a/vendor/symfony/validator/Constraints/LocaleValidator.php +++ b/vendor/symfony/validator/Constraints/LocaleValidator.php @@ -48,10 +48,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Locale::NO_SUCH_LOCALE_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Locale::NO_SUCH_LOCALE_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Luhn.php b/vendor/symfony/validator/Constraints/Luhn.php index 24f5bc7..67f152d 100644 --- a/vendor/symfony/validator/Constraints/Luhn.php +++ b/vendor/symfony/validator/Constraints/Luhn.php @@ -25,8 +25,8 @@ */ class Luhn extends Constraint { - const INVALID_CHARACTERS_ERROR = 1; - const CHECKSUM_FAILED_ERROR = 2; + const INVALID_CHARACTERS_ERROR = 'dfad6d23-1b74-4374-929b-5cbb56fc0d9e'; + const CHECKSUM_FAILED_ERROR = '4d760774-3f50-4cd5-a6d5-b10a3299d8d3'; protected static $errorNames = array( self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR', diff --git a/vendor/symfony/validator/Constraints/NotBlank.php b/vendor/symfony/validator/Constraints/NotBlank.php index 750f412..e059f10 100644 --- a/vendor/symfony/validator/Constraints/NotBlank.php +++ b/vendor/symfony/validator/Constraints/NotBlank.php @@ -21,5 +21,11 @@ */ class NotBlank extends Constraint { + const IS_BLANK_ERROR = 'c1051bb4-d103-4f74-8988-acbcafc7fdc3'; + + protected static $errorNames = array( + self::IS_BLANK_ERROR => 'IS_BLANK_ERROR', + ); + public $message = 'This value should not be blank.'; } diff --git a/vendor/symfony/validator/Constraints/NotBlankValidator.php b/vendor/symfony/validator/Constraints/NotBlankValidator.php index f0d4f21..7ea5f1f 100644 --- a/vendor/symfony/validator/Constraints/NotBlankValidator.php +++ b/vendor/symfony/validator/Constraints/NotBlankValidator.php @@ -34,10 +34,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(NotBlank::IS_BLANK_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(NotBlank::IS_BLANK_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/NotEqualTo.php b/vendor/symfony/validator/Constraints/NotEqualTo.php index abd8092..8c5abdd 100644 --- a/vendor/symfony/validator/Constraints/NotEqualTo.php +++ b/vendor/symfony/validator/Constraints/NotEqualTo.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class NotEqualTo extends AbstractComparison { + const IS_EQUAL_ERROR = 'aa2e33da-25c8-4d76-8c6c-812f02ea89dd'; + + protected static $errorNames = array( + self::IS_EQUAL_ERROR => 'IS_EQUAL_ERROR', + ); + public $message = 'This value should not be equal to {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/NotEqualToValidator.php b/vendor/symfony/validator/Constraints/NotEqualToValidator.php index 5710a85..b80c5ea 100644 --- a/vendor/symfony/validator/Constraints/NotEqualToValidator.php +++ b/vendor/symfony/validator/Constraints/NotEqualToValidator.php @@ -15,6 +15,7 @@ * Validates values are all unequal (!=). * * @author Daniel Holmes + * @author Bernhard Schussek */ class NotEqualToValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 != $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return NotEqualTo::IS_EQUAL_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/NotIdenticalTo.php b/vendor/symfony/validator/Constraints/NotIdenticalTo.php index fb4ef3f..4c9c63e 100644 --- a/vendor/symfony/validator/Constraints/NotIdenticalTo.php +++ b/vendor/symfony/validator/Constraints/NotIdenticalTo.php @@ -16,8 +16,15 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * @author Bernhard Schussek */ class NotIdenticalTo extends AbstractComparison { + const IS_IDENTICAL_ERROR = '4aaac518-0dda-4129-a6d9-e216b9b454a0'; + + protected static $errorNames = array( + self::IS_IDENTICAL_ERROR => 'IS_IDENTICAL_ERROR', + ); + public $message = 'This value should not be identical to {{ compared_value_type }} {{ compared_value }}.'; } diff --git a/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php b/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php index ed8dc1c..3ea8b5a 100644 --- a/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php +++ b/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php @@ -15,6 +15,7 @@ * Validates values aren't identical (!==). * * @author Daniel Holmes + * @author Bernhard Schussek */ class NotIdenticalToValidator extends AbstractComparisonValidator { @@ -25,4 +26,12 @@ protected function compareValues($value1, $value2) { return $value1 !== $value2; } + + /** + * {@inheritdoc} + */ + protected function getErrorCode() + { + return NotIdenticalTo::IS_IDENTICAL_ERROR; + } } diff --git a/vendor/symfony/validator/Constraints/NotNull.php b/vendor/symfony/validator/Constraints/NotNull.php index 57f2492..1cfc1c8 100644 --- a/vendor/symfony/validator/Constraints/NotNull.php +++ b/vendor/symfony/validator/Constraints/NotNull.php @@ -21,5 +21,11 @@ */ class NotNull extends Constraint { + const IS_NULL_ERROR = 'ad32d13f-c3d4-423b-909a-857b961eb720'; + + protected static $errorNames = array( + self::IS_NULL_ERROR => 'IS_NULL_ERROR', + ); + public $message = 'This value should not be null.'; } diff --git a/vendor/symfony/validator/Constraints/NotNullValidator.php b/vendor/symfony/validator/Constraints/NotNullValidator.php index 88ffb98..0402b3d 100644 --- a/vendor/symfony/validator/Constraints/NotNullValidator.php +++ b/vendor/symfony/validator/Constraints/NotNullValidator.php @@ -13,6 +13,7 @@ use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; +use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Exception\UnexpectedTypeException; /** @@ -30,7 +31,17 @@ public function validate($value, Constraint $constraint) } if (null === $value) { - $this->context->addViolation($constraint->message); + if ($this->context instanceof ExecutionContextInterface) { + $this->context->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(NotNull::IS_NULL_ERROR) + ->addViolation(); + } else { + $this->buildViolation($constraint->message) + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(NotNull::IS_NULL_ERROR) + ->addViolation(); + } } } } diff --git a/vendor/symfony/validator/Constraints/Range.php b/vendor/symfony/validator/Constraints/Range.php index c59c50c..bf050ac 100644 --- a/vendor/symfony/validator/Constraints/Range.php +++ b/vendor/symfony/validator/Constraints/Range.php @@ -22,14 +22,32 @@ */ class Range extends Constraint { - const INVALID_VALUE_ERROR = 1; - const BEYOND_RANGE_ERROR = 2; - const BELOW_RANGE_ERROR = 3; + const INVALID_CHARACTERS_ERROR = 'ad9a9798-7a99-4df7-8ce9-46e416a1e60b'; + const TOO_HIGH_ERROR = '2d28afcb-e32e-45fb-a815-01c431a86a69'; + const TOO_LOW_ERROR = '76454e69-502c-46c5-9643-f447d837c4d5'; + + /** + * @deprecated Deprecated since version 2.8, to be removed in 3.0. Use + * {@link INVALID_CHARACTERS_ERROR} instead. + */ + const INVALID_VALUE_ERROR = self::INVALID_CHARACTERS_ERROR; + + /** + * @deprecated Deprecated since version 2.8, to be removed in 3.0. Use + * {@link TOO_HIGH_ERROR} instead. + */ + const BEYOND_RANGE_ERROR = self::TOO_HIGH_ERROR; + + /** + * @deprecated Deprecated since version 2.8, to be removed in 3.0. Use + * {@link TOO_LOW_ERROR} instead. + */ + const BELOW_RANGE_ERROR = self::TOO_LOW_ERROR; 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', + self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR', + self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR', + self::TOO_LOW_ERROR => 'TOO_LOW_ERROR', ); public $minMessage = 'This value should be {{ limit }} or more.'; diff --git a/vendor/symfony/validator/Constraints/RangeValidator.php b/vendor/symfony/validator/Constraints/RangeValidator.php index 8f5fdda..05ef3b4 100644 --- a/vendor/symfony/validator/Constraints/RangeValidator.php +++ b/vendor/symfony/validator/Constraints/RangeValidator.php @@ -38,12 +38,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->invalidMessage) ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE)) - ->setCode(Range::INVALID_VALUE_ERROR) + ->setCode(Range::INVALID_CHARACTERS_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->invalidMessage) ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE)) - ->setCode(Range::INVALID_VALUE_ERROR) + ->setCode(Range::INVALID_CHARACTERS_ERROR) ->addViolation(); } @@ -72,13 +72,13 @@ public function validate($value, Constraint $constraint) $this->context->buildViolation($constraint->maxMessage) ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE)) ->setParameter('{{ limit }}', $this->formatValue($max, self::PRETTY_DATE)) - ->setCode(Range::BEYOND_RANGE_ERROR) + ->setCode(Range::TOO_HIGH_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->maxMessage) ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE)) ->setParameter('{{ limit }}', $this->formatValue($max, self::PRETTY_DATE)) - ->setCode(Range::BEYOND_RANGE_ERROR) + ->setCode(Range::TOO_HIGH_ERROR) ->addViolation(); } @@ -90,13 +90,13 @@ public function validate($value, Constraint $constraint) $this->context->buildViolation($constraint->minMessage) ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE)) ->setParameter('{{ limit }}', $this->formatValue($min, self::PRETTY_DATE)) - ->setCode(Range::BELOW_RANGE_ERROR) + ->setCode(Range::TOO_LOW_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->minMessage) ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE)) ->setParameter('{{ limit }}', $this->formatValue($min, self::PRETTY_DATE)) - ->setCode(Range::BELOW_RANGE_ERROR) + ->setCode(Range::TOO_LOW_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Regex.php b/vendor/symfony/validator/Constraints/Regex.php index 724274a..ec2fd7d 100644 --- a/vendor/symfony/validator/Constraints/Regex.php +++ b/vendor/symfony/validator/Constraints/Regex.php @@ -21,6 +21,12 @@ */ class Regex extends Constraint { + const REGEX_FAILED_ERROR = 'de1e3db3-5ed4-4941-aae4-59f3667cc3a3'; + + protected static $errorNames = array( + self::REGEX_FAILED_ERROR => 'REGEX_FAILED_ERROR', + ); + public $message = 'This value is not valid.'; public $pattern; public $htmlPattern; diff --git a/vendor/symfony/validator/Constraints/RegexValidator.php b/vendor/symfony/validator/Constraints/RegexValidator.php index 850d760..0aa0ed5 100644 --- a/vendor/symfony/validator/Constraints/RegexValidator.php +++ b/vendor/symfony/validator/Constraints/RegexValidator.php @@ -47,10 +47,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Regex::REGEX_FAILED_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Regex::REGEX_FAILED_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Time.php b/vendor/symfony/validator/Constraints/Time.php index 1134c2e..6bd8dbd 100644 --- a/vendor/symfony/validator/Constraints/Time.php +++ b/vendor/symfony/validator/Constraints/Time.php @@ -21,8 +21,8 @@ */ class Time extends Constraint { - const INVALID_FORMAT_ERROR = 1; - const INVALID_TIME_ERROR = 2; + const INVALID_FORMAT_ERROR = '9d27b2bb-f755-4fbf-b725-39b1edbdebdf'; + const INVALID_TIME_ERROR = '8532f9e1-84b2-4d67-8989-0818bc38533b'; protected static $errorNames = array( self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR', diff --git a/vendor/symfony/validator/Constraints/Type.php b/vendor/symfony/validator/Constraints/Type.php index afe5903..e40b478 100644 --- a/vendor/symfony/validator/Constraints/Type.php +++ b/vendor/symfony/validator/Constraints/Type.php @@ -21,6 +21,12 @@ */ class Type extends Constraint { + const INVALID_TYPE_ERROR = 'ba785a8c-82cb-4283-967c-3cf342181b40'; + + protected static $errorNames = array( + self::INVALID_TYPE_ERROR => 'INVALID_TYPE_ERROR', + ); + public $message = 'This value should be of type {{ type }}.'; public $type; diff --git a/vendor/symfony/validator/Constraints/TypeValidator.php b/vendor/symfony/validator/Constraints/TypeValidator.php index 592f122..48f7e28 100644 --- a/vendor/symfony/validator/Constraints/TypeValidator.php +++ b/vendor/symfony/validator/Constraints/TypeValidator.php @@ -51,11 +51,13 @@ public function validate($value, Constraint $constraint) $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) ->setParameter('{{ type }}', $constraint->type) + ->setCode(Type::INVALID_TYPE_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) ->setParameter('{{ type }}', $constraint->type) + ->setCode(Type::INVALID_TYPE_ERROR) ->addViolation(); } } diff --git a/vendor/symfony/validator/Constraints/Url.php b/vendor/symfony/validator/Constraints/Url.php index 3637bc1..8453a90 100644 --- a/vendor/symfony/validator/Constraints/Url.php +++ b/vendor/symfony/validator/Constraints/Url.php @@ -21,6 +21,12 @@ */ class Url extends Constraint { + const INVALID_URL_ERROR = '57c2f299-1154-4870-89bb-ef3b1f5ad229'; + + protected static $errorNames = array( + self::INVALID_URL_ERROR => 'INVALID_URL_ERROR', + ); + public $message = 'This value is not a valid URL.'; public $dnsMessage = 'The host could not be resolved.'; public $protocols = array('http', 'https'); diff --git a/vendor/symfony/validator/Constraints/UrlValidator.php b/vendor/symfony/validator/Constraints/UrlValidator.php index 1fd76a8..7497bec 100644 --- a/vendor/symfony/validator/Constraints/UrlValidator.php +++ b/vendor/symfony/validator/Constraints/UrlValidator.php @@ -34,7 +34,7 @@ class UrlValidator extends ConstraintValidator \] # a IPv6 address ) (:[0-9]+)? # a port (optional) - (/?|/\S+|\?|\#) # a /, nothing, a / with something, a query or a fragment + (/?|/\S+|\?\S*|\#\S*) # a /, nothing, a / with something, a query or a fragment $~ixu'; /** @@ -65,10 +65,12 @@ public function validate($value, Constraint $constraint) if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Url::INVALID_URL_ERROR) ->addViolation(); } else { $this->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Url::INVALID_URL_ERROR) ->addViolation(); } @@ -81,12 +83,14 @@ public function validate($value, Constraint $constraint) if (!checkdnsrr($host, 'ANY')) { if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->dnsMessage) - ->setParameter('{{ value }}', $this->formatValue($host)) - ->addViolation(); + ->setParameter('{{ value }}', $this->formatValue($host)) + ->setCode(Url::INVALID_URL_ERROR) + ->addViolation(); } else { $this->buildViolation($constraint->dnsMessage) - ->setParameter('{{ value }}', $this->formatValue($host)) - ->addViolation(); + ->setParameter('{{ value }}', $this->formatValue($host)) + ->setCode(Url::INVALID_URL_ERROR) + ->addViolation(); } } } diff --git a/vendor/symfony/validator/Constraints/Uuid.php b/vendor/symfony/validator/Constraints/Uuid.php index 8589b95..2deecba 100644 --- a/vendor/symfony/validator/Constraints/Uuid.php +++ b/vendor/symfony/validator/Constraints/Uuid.php @@ -21,12 +21,12 @@ */ 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; + const TOO_SHORT_ERROR = 'aa314679-dac9-4f54-bf97-b2049df8f2a3'; + const TOO_LONG_ERROR = '494897dd-36f8-4d31-8923-71a8d5f3000d'; + const INVALID_CHARACTERS_ERROR = '51120b12-a2bc-41bf-aa53-cd73daf330d0'; + const INVALID_HYPHEN_PLACEMENT_ERROR = '98469c83-0309-4f5d-bf95-a496dcaa869c'; + const INVALID_VERSION_ERROR = '21ba13b4-b185-4882-ac6f-d147355987eb'; + const INVALID_VARIANT_ERROR = '164ef693-2b9d-46de-ad7f-836201f0c2db'; protected static $errorNames = array( self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR', diff --git a/vendor/symfony/validator/README.md b/vendor/symfony/validator/README.md index 4555b9a..b30db40 100644 --- a/vendor/symfony/validator/README.md +++ b/vendor/symfony/validator/README.md @@ -113,7 +113,7 @@ https://github.com/silexphp/Silex/blob/master/src/Silex/Provider/ValidatorServic Documentation: -https://symfony.com/doc/2.7/book/validation.html +https://symfony.com/doc/2.8/book/validation.html JSR-303 Specification: diff --git a/vendor/symfony/validator/Resources/translations/validators.de.xlf b/vendor/symfony/validator/Resources/translations/validators.de.xlf index 105f2fb..541ebaa 100644 --- a/vendor/symfony/validator/Resources/translations/validators.de.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.de.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. Dieser Wert entspricht nicht dem erwarteten Zeichensatz {{ charset }}. + + This is not a valid Business Identifier Code (BIC). + Dieser Wert ist kein gültiger BIC. + diff --git a/vendor/symfony/validator/Resources/translations/validators.en.xlf b/vendor/symfony/validator/Resources/translations/validators.en.xlf index e666c79..ec072eb 100644 --- a/vendor/symfony/validator/Resources/translations/validators.en.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.en.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. This value does not match the expected {{ charset }} charset. + + This is not a valid Business Identifier Code (BIC). + This is not a valid Business Identifier Code (BIC). + diff --git a/vendor/symfony/validator/Resources/translations/validators.es.xlf b/vendor/symfony/validator/Resources/translations/validators.es.xlf index d874573..1fa59dd 100644 --- a/vendor/symfony/validator/Resources/translations/validators.es.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.es.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. La codificación de caracteres para este valor debería ser {{ charset }}. + + This is not a valid Business Identifier Code (BIC). + No es un Código de Identificación Bancaria (BIC) válido. + diff --git a/vendor/symfony/validator/Resources/translations/validators.hu.xlf b/vendor/symfony/validator/Resources/translations/validators.hu.xlf index a972c02..a113a72 100644 --- a/vendor/symfony/validator/Resources/translations/validators.hu.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.hu.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. Ez az érték nem az elvárt {{ charset }} karakterkódolást használja. + + This is not a valid Business Identifier Code (BIC). + Érvénytelen nemzetközi bankazonosító kód (BIC/SWIFT). + diff --git a/vendor/symfony/validator/Resources/translations/validators.ja.xlf b/vendor/symfony/validator/Resources/translations/validators.ja.xlf index a58f5b8..4af93fa 100644 --- a/vendor/symfony/validator/Resources/translations/validators.ja.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.ja.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. この値は予期される文字コード（{{ charset }}）と異なります。 + + This is not a valid Business Identifier Code (BIC). + 有効なSWIFTコードではありません。 + diff --git a/vendor/symfony/validator/Resources/translations/validators.nl.xlf b/vendor/symfony/validator/Resources/translations/validators.nl.xlf index fe33469..371ad97 100644 --- a/vendor/symfony/validator/Resources/translations/validators.nl.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.nl.xlf @@ -306,6 +306,10 @@ This value does not match the expected {{ charset }} charset. Deze waarde is niet in de verwachte tekencodering {{ charset }}. + + This is not a valid Business Identifier Code (BIC). + Dit is geen geldige bedrijfsidentificatiecode (BIC/SWIFT). + diff --git a/vendor/symfony/validator/Resources/translations/validators.pl.xlf b/vendor/symfony/validator/Resources/translations/validators.pl.xlf index 1d6875f..c40f76e 100644 --- a/vendor/symfony/validator/Resources/translations/validators.pl.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.pl.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. Ta wartość nie pasuje do oczekiwanego zestawu znaków {{ charset }}. + + This is not a valid Business Identifier Code (BIC). + Ta wartość nie jest poprawnym kodem BIC (Business Identifier Code). + diff --git a/vendor/symfony/validator/Resources/translations/validators.sl.xlf b/vendor/symfony/validator/Resources/translations/validators.sl.xlf index 4f0e7c6..834db40 100644 --- a/vendor/symfony/validator/Resources/translations/validators.sl.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.sl.xlf @@ -310,6 +310,10 @@ This value does not match the expected {{ charset }} charset. Ta vrednost se ne ujema s pričakovanim naborom znakov {{ charset }}. + + This is not a valid Business Identifier Code (BIC). + To ni veljavna identifikacijska koda podjetja (BIC). + diff --git a/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php b/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php index b7cc2ec..e02d61b 100644 --- a/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php +++ b/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php @@ -94,7 +94,7 @@ public function setPlural($number); /** * Sets the violation code. * - * @param int $code The violation code + * @param string|null $code The violation code * * @return ConstraintViolationBuilderInterface This builder */ diff --git a/vendor/symfony/validator/composer.json b/vendor/symfony/validator/composer.json index c0a898a..179e8cf 100644 --- a/vendor/symfony/validator/composer.json +++ b/vendor/symfony/validator/composer.json @@ -17,16 +17,15 @@ ], "require": { "php": ">=5.3.9", - "symfony/translation": "~2.4" + "symfony/translation": "~2.4|~3.0.0" }, "require-dev": { - "doctrine/common": "~2.3", - "symfony/http-foundation": "~2.1", - "symfony/intl": "~2.4", - "symfony/yaml": "~2.0,>=2.0.5", - "symfony/config": "~2.2", - "symfony/property-access": "~2.3", - "symfony/expression-language": "~2.4", + "symfony/http-foundation": "~2.1|~3.0.0", + "symfony/intl": "~2.4|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/config": "~2.2|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", "egulias/email-validator": "~1.2,>=1.2.1" @@ -43,12 +42,15 @@ "symfony/expression-language": "For using the 2.4 Expression validator" }, "autoload": { - "psr-4": { "Symfony\\Component\\Validator\\": "" } + "psr-4": { "Symfony\\Component\\Validator\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/validator/phpunit.xml.dist b/vendor/symfony/validator/phpunit.xml.dist index 1bf4391..cf8c343 100644 --- a/vendor/symfony/validator/phpunit.xml.dist +++ b/vendor/symfony/validator/phpunit.xml.dist @@ -20,8 +20,9 @@ ./ - ./vendor + ./Resources ./Tests + ./vendor diff --git a/vendor/symfony/yaml/CHANGELOG.md b/vendor/symfony/yaml/CHANGELOG.md index 096cf65..f55b570 100644 --- a/vendor/symfony/yaml/CHANGELOG.md +++ b/vendor/symfony/yaml/CHANGELOG.md @@ -1,6 +1,26 @@ CHANGELOG ========= +2.8.0 +----- + + * Deprecated usage of a colon in an unquoted mapping value + * Deprecated usage of @, \`, | and > at the beginning of an unquoted string + * When surrounding strings with double-quotes, you must now escape `\` characters. Not + escaping those characters (when surrounded by double-quotes) is deprecated. + + Before: + + ```yml + class: "Foo\Var" + ``` + + After: + + ```yml + class: "Foo\\Var" + ``` + 2.1.0 ----- diff --git a/vendor/symfony/yaml/Escaper.php b/vendor/symfony/yaml/Escaper.php index ac325a2..3487a6a 100644 --- a/vendor/symfony/yaml/Escaper.php +++ b/vendor/symfony/yaml/Escaper.php @@ -16,6 +16,8 @@ * YAML strings. * * @author Matthew Lewinski + * + * @internal */ class Escaper { diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php index a5b53bd..65ee79e 100644 --- a/vendor/symfony/yaml/Inline.php +++ b/vendor/symfony/yaml/Inline.php @@ -52,7 +52,7 @@ public static function parse($value, $exceptionOnInvalidType = false, $objectSup return ''; } - if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { + if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) { $mbEncoding = mb_internal_encoding(); mb_internal_encoding('ASCII'); } @@ -204,6 +204,8 @@ private static function dumpArray($value, $exceptionOnInvalidType, $objectSuppor * @return string A YAML string * * @throws ParseException When malformed inline YAML string is parsed + * + * @internal */ public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array()) { @@ -234,6 +236,14 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar)); } + // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >) + if ($output && ('@' === $output[0] || '`' === $output[0] || '|' === $output[0] || '>' === $output[0])) { + @trigger_error(sprintf('Not quoting a scalar starting with "%s" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $output[0]), E_USER_DEPRECATED); + + // to be thrown in 3.0 + // throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0])); + } + if ($evaluate) { $output = self::evaluateScalar($output, $references); } diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php index 04f2237..47af338 100644 --- a/vendor/symfony/yaml/Parser.php +++ b/vendor/symfony/yaml/Parser.php @@ -62,7 +62,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport = $value = $this->cleanup($value); $this->lines = explode("\n", $value); - if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { + if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) { $mbEncoding = mb_internal_encoding(); mb_internal_encoding('UTF-8'); } @@ -114,7 +114,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport = $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport, $objectForMap); } else { - $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap); + $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap, $context); } } if ($isRef) { @@ -230,7 +230,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport = } } } else { - $value = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap); + $value = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap, $context); // Spec: Keys MUST be unique; first one wins. // But overwriting is allowed when a merge node is used in current block. if ($allowOverwrite || !isset($data[$key])) { @@ -347,7 +347,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false) if (null === $indentation) { $newIndent = $this->getCurrentLineIndentation(); - $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem($this->currentLine); + $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem(); if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) { throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine); @@ -373,7 +373,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false) return; } - $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine); + $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem(); // Comments must not be removed inside a block scalar $removeCommentsPattern = '~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~'; @@ -386,7 +386,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false) $removeComments = !preg_match($removeCommentsPattern, $this->currentLine); } - if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine) && $newIndent === $indent) { + if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) { $this->moveToPreviousLine(); break; } @@ -445,12 +445,13 @@ private function moveToPreviousLine() * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise * @param bool $objectSupport True if object support is enabled, false otherwise * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param string $context The parser context (either sequence or mapping) * * @return mixed A PHP value * * @throws ParseException When reference does not exist */ - private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap) + private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $context) { if (0 === strpos($value, '*')) { if (false !== $pos = strpos($value, '#')) { @@ -473,7 +474,16 @@ private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $ob } try { - return Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs); + $parsedValue = Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs); + + if ('mapping' === $context && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) { + @trigger_error(sprintf('Using a colon in an unquoted mapping value in line %d is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED); + + // to be thrown in 3.0 + // throw new ParseException('A colon cannot be used in an unquoted mapping value.'); + } + + return $parsedValue; } catch (ParseException $e) { $e->setParsedLine($this->getRealCurrentLineNb() + 1); $e->setSnippet($this->currentLine); @@ -690,7 +700,7 @@ private function isNextLineUnIndentedCollection() if ( $this->getCurrentLineIndentation() == $currentIndentation && - $this->isStringUnIndentedCollectionItem($this->currentLine) + $this->isStringUnIndentedCollectionItem() ) { $ret = true; } diff --git a/vendor/symfony/yaml/Unescaper.php b/vendor/symfony/yaml/Unescaper.php index 1b5e5ec..d2f5054 100644 --- a/vendor/symfony/yaml/Unescaper.php +++ b/vendor/symfony/yaml/Unescaper.php @@ -16,6 +16,8 @@ * YAML strings. * * @author Matthew Lewinski + * + * @internal */ class Unescaper { @@ -32,7 +34,7 @@ class Unescaper /** * Regex fragment that matches an escaped character in a double quoted string. */ - const REGEX_ESCAPED_CHARACTER = "\\\\([0abt\tnvfre \\\"\\/\\\\N_LP]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})"; + const REGEX_ESCAPED_CHARACTER = "\\\\(x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8}|.)"; /** * Unescapes a single quoted string. @@ -70,10 +72,13 @@ public function unescapeDoubleQuotedString($value) * @param string $value An escaped character * * @return string The unescaped character + * + * @internal This method is public to be usable as callback. It should not + * be used in user code. Should be changed in 3.0. */ public function unescapeCharacter($value) { - switch ($value{1}) { + switch ($value[1]) { case '0': return "\x0"; case 'a': @@ -120,6 +125,10 @@ public function unescapeCharacter($value) return self::utf8chr(hexdec(substr($value, 2, 4))); case 'U': return self::utf8chr(hexdec(substr($value, 2, 8))); + default: + @trigger_error('Not escaping a backslash in a double-quoted string is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', E_USER_DEPRECATED); + + return $value; } } diff --git a/vendor/symfony/yaml/composer.json b/vendor/symfony/yaml/composer.json index b798141..af97f80 100644 --- a/vendor/symfony/yaml/composer.json +++ b/vendor/symfony/yaml/composer.json @@ -19,12 +19,15 @@ "php": ">=5.3.9" }, "autoload": { - "psr-4": { "Symfony\\Component\\Yaml\\": "" } + "psr-4": { "Symfony\\Component\\Yaml\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } } } diff --git a/vendor/symfony/yaml/phpunit.xml.dist b/vendor/symfony/yaml/phpunit.xml.dist index 418b2c6..6bdbea1 100644 --- a/vendor/symfony/yaml/phpunit.xml.dist +++ b/vendor/symfony/yaml/phpunit.xml.dist @@ -20,8 +20,8 @@ ./ - ./vendor ./Tests + ./vendor diff --git a/vendor/zendframework/zend-diactoros/CHANGELOG.md b/vendor/zendframework/zend-diactoros/CHANGELOG.md index 57b0a87..aca2ab8 100644 --- a/vendor/zendframework/zend-diactoros/CHANGELOG.md +++ b/vendor/zendframework/zend-diactoros/CHANGELOG.md @@ -2,12 +2,70 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 1.1.3 - 2015-08-10 +## 1.2.0 - 2015-11-24 ### Added +- [#88](https://github.com/zendframework/zend-diactoros/pull/88) updates the + `SapiEmitter` to emit a `Content-Length` header with the content length as + reported by the response body stream, assuming that + `StreamInterface::getSize()` returns an integer. +- [#77](https://github.com/zendframework/zend-diactoros/pull/77) adds a new + response type, `Zend\Diactoros\Response\TextResponse`, for returning plain + text responses. By default, it sets the content type to `text/plain; + charset=utf-8`; per the other response types, the signature is `new + TextResponse($text, $status = 200, array $headers = []`. +- [#90](https://github.com/zendframework/zend-diactoros/pull/90) adds a new + `Zend\Diactoros\CallbackStream`, allowing you to back a stream with a PHP + callable (such as a generator) to generate the message content. Its + constructor accepts the callable: `$stream = new CallbackStream($callable);` + +### Deprecated + +- Nothing. + +### Removed + - Nothing. +### Fixed + +- [#77](https://github.com/zendframework/zend-diactoros/pull/77) updates the + `HtmlResponse` to set the charset to utf-8 by default (if no content type + header is provided at instantiation). + +## 1.1.4 - 2015-10-16 + +### Added + +- [#98](https://github.com/zendframework/zend-diactoros/pull/98) adds + `JSON_UNESCAPED_SLASHES` to the default `json_encode` flags used by + `Zend\Diactoros\Response\JsonResponse`. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#96](https://github.com/zendframework/zend-diactoros/pull/96) updates + `withPort()` to allow `null` port values (indicating usage of default for + the given scheme). +- [#91](https://github.com/zendframework/zend-diactoros/pull/91) fixes the + logic of `withUri()` to do a case-insensitive check for an existing `Host` + header, replacing it with the new one. + +## 1.1.3 - 2015-08-10 + +### Added + +- [#73](https://github.com/zendframework/zend-diactoros/pull/73) adds caching of + the vendor directory to the Travis-CI configuration, to speed up builds. + ### Deprecated - Nothing. @@ -181,7 +239,7 @@ immediately. - [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the behavior of how the `ServerRequestFactory` marshals upload files when they are represented as a nested associative array. -- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several +- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several fixes that ensure that Diactoros complies with the PSR-7 specification: - `MessageInterface::getHeaderLine()` MUST return a string (that string CAN be empty). Previously, Diactoros would return `null`. diff --git a/vendor/zendframework/zend-diactoros/README.md b/vendor/zendframework/zend-diactoros/README.md index b25dc9b..0d18a99 100644 --- a/vendor/zendframework/zend-diactoros/README.md +++ b/vendor/zendframework/zend-diactoros/README.md @@ -27,8 +27,14 @@ $ php -S 0.0.0.0:8080 -t doc/html/ # then browse to http://localhost:8080/ > ### Bookdown > -> You can install bookdown globally using `composer global require bookdown/bookdown`. If you do -> this, make sure that `$HOME/.composer/vendor/bin` is on your `$PATH`. +> You can install bookdown globally using `composer global require bookdown/bookdown`. +> If you do this, make sure that `$HOME/.composer/vendor/bin` is on your `$PATH`; +> on *nix-like systems, you can do this by adding the following line to your +> `.bashrc` (or preferred shell RC file): +> +> ```bash +> export PATH="$HOME/.composer/vendor/bin:$PATH" +> ``` [Master]: https://travis-ci.org/zendframework/zend-diactoros [Master image]: https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=master diff --git a/vendor/zendframework/zend-diactoros/composer.json b/vendor/zendframework/zend-diactoros/composer.json index fee75d9..3e59a48 100644 --- a/vendor/zendframework/zend-diactoros/composer.json +++ b/vendor/zendframework/zend-diactoros/composer.json @@ -15,8 +15,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" } }, "require": { diff --git a/vendor/zendframework/zend-diactoros/phpcs.xml b/vendor/zendframework/zend-diactoros/phpcs.xml deleted file mode 100644 index e994eae..0000000 --- a/vendor/zendframework/zend-diactoros/phpcs.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Zend Framework coding standard - - - - - - - - - - - - - - - - src - test - diff --git a/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/vendor/zendframework/zend-diactoros/src/RequestTrait.php index 2ef15a9..a272bf3 100644 --- a/vendor/zendframework/zend-diactoros/src/RequestTrait.php +++ b/vendor/zendframework/zend-diactoros/src/RequestTrait.php @@ -249,6 +249,16 @@ public function withUri(UriInterface $uri, $preserveHost = false) } $new->headerNames['host'] = 'Host'; + + // Remove an existing host header if present, regardless of current + // de-normalization of the header name. + // @see https://github.com/zendframework/zend-diactoros/issues/91 + foreach (array_keys($new->headers) as $header) { + if (strtolower($header) === 'host') { + unset($new->headers[$header]); + } + } + $new->headers['Host'] = [$host]; return $new; diff --git a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php index d298ee0..3342609 100644 --- a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php +++ b/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php @@ -41,7 +41,7 @@ public function __construct($html, $status = 200, array $headers = []) parent::__construct( $this->createBody($html), $status, - $this->injectContentType('text/html', $headers) + $this->injectContentType('text/html; charset=utf-8', $headers) ); } diff --git a/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php index 766c866..5e41458 100644 --- a/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php +++ b/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php @@ -25,6 +25,17 @@ class JsonResponse extends Response use InjectContentTypeTrait; /** + * Default flags for json_encode; value of: + * + * + * JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES + * + * + * @const int + */ + const DEFAULT_JSON_FLAGS = 79; + + /** * Create a JSON response with the given data. * * Default JSON encoding is performed with the following options, which @@ -34,6 +45,7 @@ class JsonResponse extends Response * - JSON_HEX_APOS * - JSON_HEX_AMP * - JSON_HEX_QUOT + * - JSON_UNESCAPED_SLASHES * * @param mixed $data Data to convert to JSON. * @param int $status Integer status code for the response; 200 by default. @@ -41,8 +53,12 @@ class JsonResponse extends Response * @param int $encodingOptions JSON encoding options to use. * @throws InvalidArgumentException if unable to encode the $data to JSON. */ - public function __construct($data, $status = 200, array $headers = [], $encodingOptions = 15) - { + public function __construct( + $data, + $status = 200, + array $headers = [], + $encodingOptions = self::DEFAULT_JSON_FLAGS + ) { $body = new Stream('php://temp', 'wb+'); $body->write($this->jsonEncode($data, $encodingOptions)); diff --git a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php index bba291e..c59257b 100644 --- a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php +++ b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php @@ -29,6 +29,14 @@ public function emit(ResponseInterface $response, $maxBufferLevel = null) throw new RuntimeException('Unable to emit response; headers already sent'); } + if (! $response->hasHeader('Content-Length')) { + // PSR-7 indicates int OR null for the stream size; for null values, + // we will not auto-inject the Content-Length. + if (null !== $response->getBody()->getSize()) { + $response = $response->withHeader('Content-Length', (string) $response->getBody()->getSize()); + } + } + $this->emitStatusLine($response); $this->emitHeaders($response); $this->emitBody($response, $maxBufferLevel); diff --git a/vendor/zendframework/zend-diactoros/src/Uri.php b/vendor/zendframework/zend-diactoros/src/Uri.php index be3077a..ff92107 100644 --- a/vendor/zendframework/zend-diactoros/src/Uri.php +++ b/vendor/zendframework/zend-diactoros/src/Uri.php @@ -306,21 +306,23 @@ public function withHost($host) */ public function withPort($port) { - if (! is_numeric($port)) { + if (! is_numeric($port) && $port !== null) { throw new InvalidArgumentException(sprintf( - 'Invalid port "%s" specified; must be an integer or integer string', + 'Invalid port "%s" specified; must be an integer, an integer string, or null', (is_object($port) ? get_class($port) : gettype($port)) )); } - $port = (int) $port; + if ($port !== null) { + $port = (int) $port; + } if ($port === $this->port) { // Do nothing if no change was made. return clone $this; } - if ($port < 1 || $port > 65535) { + if ($port !== null && $port < 1 || $port > 65535) { throw new InvalidArgumentException(sprintf( 'Invalid port "%d" specified; must be a valid TCP/UDP port', $port diff --git a/vendor/zendframework/zend-feed/CHANGELOG.md b/vendor/zendframework/zend-feed/CHANGELOG.md index 426cab5..850a7b1 100644 --- a/vendor/zendframework/zend-feed/CHANGELOG.md +++ b/vendor/zendframework/zend-feed/CHANGELOG.md @@ -2,11 +2,42 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.5.2 - TBD +## 2.6.0 - 2015-11-24 ### Added -- Nothing. +- [#13](https://github.com/zendframework/zend-feed/pull/13) introduces + `Zend\Feed\Writer\StandaloneExtensionManager`, an implementation of + `Zend\Feed\Writer\ExtensionManagerInterface` that has no dependencies. + `Zend\Feed\Writer\ExtensionManager` now composes this by default, instead of + `Zend\Feed\Writer\ExtensionPluginManager`, for managing the various feed and + entry extensions. If you relied on `ExtensionPluginManager` previously, you + will need to create an instance manually and inject it into the `Writer` + instance. +- [#14](https://github.com/zendframework/zend-feed/pull/14) introduces: + - `Zend\Feed\Reader\Http\HeaderAwareClientInterface`, which extends + `ClientInterface` and adds an optional argument to the `get()` method, + `array $headers = []`; this argument allows specifying request headers for + the client to send. `$headers` should have header names for keys, and the + values should be arrays of strings/numbers representing the header values + (if only a single value is necessary, it should be represented as an single + value array). + - `Zend\Feed\Reader\Http\HeaderAwareResponseInterface`, which extends + `ResponseInterface` and adds the method `getHeader($name, $default = null)`. + Clients may return either a `ResponseInterface` or + `HeaderAwareResponseInterface` instance. + - `Zend\Feed\Reader\Http\Response`, which is an implementation of + `HeaderAwareResponseInterface`. Its constructor accepts the status code, + body, and, optionally, headers. + - `Zend\Feed\Reader\Http\Psr7ResponseDecorator`, which is an implementation of + `HeaderAwareResponseInterface`. Its constructor accepts a PSR-7 response + instance, and the various methdos then proxy to those methods. This should + make creating wrappers for PSR-7 HTTP clients trivial. + - `Zend\Feed\Reader\Http\ZendHttpClientDecorator`, which decorates a + `Zend\Http\Client` instance, implements `HeaderAwareClientInterface`, and + returns a `Response` instance seeded from the zend-http response upon + calling `get()`. The class exposes a `getDecoratedClient()` method to allow + retrieval of the decorated zend-http client instance. ### Deprecated @@ -23,3 +54,19 @@ All notable changes to this project will be documented in this file, in reverse - [#2](https://github.com/zendframework/zend-feed/pull/2) ensures that the routine for "absolutising" a link in `Reader\FeedSet` always generates a URI with a scheme. +- [#14](https://github.com/zendframework/zend-feed/pull/14) makes the following + changes to fix behavior around HTTP clients used within + `Zend\Feed\Reader\Reader`: + - `setHttpClient()` now ensures that the passed client is either a + `Zend\Feed\Reader\Http\ClientInterface` or `Zend\Http\Client`, raising an + `InvalidArgumentException` if neither. If a `Zend\Http\Client` is passed, it + is passed to the constructor of `Zend\Feed\Reader\Http\ZendHttpClientDecorator`, + and the decorator instance is used. + - `getHttpClient()` now *always* returns a `Zend\Feed\Reader\Http\ClientInterface` + instance. If no instance is currently registered, it lazy loads a + `ZendHttpClientDecorator` instance. + - `import()` was updated to consume a `ClientInterface` instance; when caches + are in play, it checks the client against `HeaderAwareClientInterface` to + determine if it can check for HTTP caching headers, and, if so, to retrieve + them. + - `findFeedLinks()` was updated to consume a `ClientInterface`. diff --git a/vendor/zendframework/zend-feed/composer.json b/vendor/zendframework/zend-feed/composer.json index 2c29f06..2daa130 100644 --- a/vendor/zendframework/zend-feed/composer.json +++ b/vendor/zendframework/zend-feed/composer.json @@ -21,24 +21,25 @@ "zendframework/zend-db": "~2.5", "zendframework/zend-cache": "~2.5", "zendframework/zend-http": "~2.5", - "zendframework/zend-servicemanager": "~2.5", "zendframework/zend-validator": "~2.5", "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "phpunit/PHPUnit": "~4.0", + "psr/http-message": "^1.0" }, "suggest": { - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-db": "Zend\\Db component", + "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", "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" + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload-dev": { @@ -46,4 +47,4 @@ "ZendTest\\Feed\\": "test/" } } -} \ No newline at end of file +} diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php index c68f360..84efaad 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php +++ b/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php @@ -104,7 +104,7 @@ public function getContent() /** * Get the entry creation date * - * @return string + * @return \DateTime */ public function getDateCreated() { @@ -122,7 +122,7 @@ public function getDateCreated() /** * Get the entry modification date * - * @return string + * @return \DateTime */ public function getDateModified() { diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php b/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php index c5e5fb2..250f4b6 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php +++ b/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php @@ -38,14 +38,14 @@ public function getContent(); /** * Get the entry creation date * - * @return string + * @return \DateTime */ public function getDateCreated(); /** * Get the entry modification date * - * @return string + * @return \DateTime */ public function getDateModified(); diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php index b55fdad..0832ba3 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php +++ b/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php @@ -167,7 +167,7 @@ public function getContent() /** * Get the entry's date of creation * - * @return string + * @return \DateTime */ public function getDateCreated() { @@ -178,7 +178,7 @@ public function getDateCreated() * Get the entry's date of modification * * @throws Exception\RuntimeException - * @return string + * @return \DateTime */ public function getDateModified() { diff --git a/vendor/zendframework/zend-feed/src/Reader/Reader.php b/vendor/zendframework/zend-feed/src/Reader/Reader.php index 09bdcf4..693a3e2 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Reader.php +++ b/vendor/zendframework/zend-feed/src/Reader/Reader.php @@ -14,6 +14,7 @@ use Zend\Cache\Storage\StorageInterface as CacheStorage; use Zend\Http as ZendHttp; use Zend\Stdlib\ErrorHandler; +use Zend\Feed\Reader\Exception\InvalidHttpClientException; /** */ @@ -57,7 +58,7 @@ class Reader implements ReaderImportInterface /** * HTTP client object to use for retrieving feeds * - * @var ZendHttp\Client + * @var Http\ClientInterface */ protected static $httpClient = null; @@ -117,23 +118,30 @@ public static function setCache(CacheStorage $cache) * * Sets the HTTP client object to use for retrieving the feeds. * - * @param ZendHttp\Client $httpClient + * @param ZendHttp\Client | Http\ClientInterface $httpClient * @return void */ - public static function setHttpClient(ZendHttp\Client $httpClient) + public static function setHttpClient($httpClient) { + if ($httpClient instanceof ZendHttp\Client) { + $httpClient = new Http\ZendHttpClientDecorator($httpClient); + } + + if (! $httpClient instanceof Http\ClientInterface) { + throw new InvalidHttpClientException(); + } static::$httpClient = $httpClient; } /** * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used. * - * @return ZendHttp\Client + * @return Http\ClientInterface */ public static function getHttpClient() { - if (!static::$httpClient instanceof ZendHttp\Client) { - static::$httpClient = new ZendHttp\Client(); + if (! static::$httpClient) { + static::$httpClient = new Http\ZendHttpClientDecorator(new ZendHttp\Client()); } return static::$httpClient; @@ -189,17 +197,16 @@ public static function useHttpConditionalGet($bool = true) */ public static function import($uri, $etag = null, $lastModified = null) { - $cache = self::getCache(); - $client = self::getHttpClient(); - $client->resetParameters(); - $headers = new ZendHttp\Headers(); - $client->setHeaders($headers); - $client->setUri($uri); + $cache = self::getCache(); + $client = self::getHttpClient(); $cacheId = 'Zend_Feed_Reader_' . md5($uri); if (static::$httpConditionalGet && $cache) { - $data = $cache->getItem($cacheId); - if ($data) { + $headers = []; + $data = $cache->getItem($cacheId); + if ($data && $client instanceof Http\HeaderAwareClientInterface) { + // Only check for ETag and last modified values in the cache + // if we have a client capable of emitting headers in the first place. if ($etag === null) { $etag = $cache->getItem($cacheId . '_etag'); } @@ -207,13 +214,13 @@ public static function import($uri, $etag = null, $lastModified = null) $lastModified = $cache->getItem($cacheId . '_lastmodified'); } if ($etag) { - $headers->addHeaderLine('If-None-Match', $etag); + $headers['If-None-Match'] = [$etag]; } if ($lastModified) { - $headers->addHeaderLine('If-Modified-Since', $lastModified); + $headers['If-Modified-Since'] = [$lastModified]; } } - $response = $client->send(); + $response = $client->get($uri, $headers); if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } @@ -222,11 +229,14 @@ public static function import($uri, $etag = null, $lastModified = null) } else { $responseXml = $response->getBody(); $cache->setItem($cacheId, $responseXml); - if ($response->getHeaders()->get('ETag')) { - $cache->setItem($cacheId . '_etag', $response->getHeaders()->get('ETag')->getFieldValue()); - } - if ($response->getHeaders()->get('Last-Modified')) { - $cache->setItem($cacheId . '_lastmodified', $response->getHeaders()->get('Last-Modified')->getFieldValue()); + + if ($response instanceof Http\HeaderAwareResponseInterface) { + if ($response->getHeaderLine('ETag', false)) { + $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag')); + } + if ($response->getHeaderLine('Last-Modified', false)) { + $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified')); + } } } return static::importString($responseXml); @@ -235,7 +245,7 @@ public static function import($uri, $etag = null, $lastModified = null) if ($data) { return static::importString($data); } - $response = $client->send(); + $response = $client->get($uri); if ((int) $response->getStatusCode() !== 200) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } @@ -243,7 +253,7 @@ public static function import($uri, $etag = null, $lastModified = null) $cache->setItem($cacheId, $responseXml); return static::importString($responseXml); } else { - $response = $client->send(); + $response = $client->get($uri); if ((int) $response->getStatusCode() !== 200) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } @@ -270,7 +280,7 @@ public static function import($uri, $etag = null, $lastModified = null) public static function importRemoteFeed($uri, Http\ClientInterface $client) { $response = $client->get($uri); - if (!$response instanceof Http\ResponseInterface) { + if (! $response instanceof Http\ResponseInterface) { throw new Exception\RuntimeException(sprintf( 'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"', __NAMESPACE__, @@ -371,9 +381,8 @@ public static function importFile($filename) */ public static function findFeedLinks($uri) { - $client = static::getHttpClient(); - $client->setUri($uri); - $response = $client->send(); + $client = static::getHttpClient(); + $response = $client->get($uri); if ($response->getStatusCode() !== 200) { throw new Exception\RuntimeException("Failed to access $uri, got response code " . $response->getStatusCode()); } diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php index 0b21b3b..054fe3e 100644 --- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php +++ b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php @@ -14,8 +14,6 @@ use Zend\Stdlib\StringUtils; use Zend\Stdlib\StringWrapper\StringWrapperInterface; -/** -*/ class Feed { /** diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php index b0e0e3b..a7efb3e 100644 --- a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php +++ b/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php @@ -12,7 +12,7 @@ /** * Default implementation of ExtensionManagerInterface * - * Decorator of ExtensionPluginManager. + * Decorator for an ExtensionManagerInstance. */ class ExtensionManager implements ExtensionManagerInterface { @@ -22,14 +22,14 @@ class ExtensionManager implements ExtensionManagerInterface * Constructor * * Seeds the extension manager with a plugin manager; if none provided, - * creates an instance. + * creates and decorates an instance of StandaloneExtensionManager. * - * @param null|ExtensionPluginManager $pluginManager + * @param null|ExtensionManagerInterface $pluginManager */ - public function __construct(ExtensionPluginManager $pluginManager = null) + public function __construct(ExtensionManagerInterface $pluginManager = null) { if (null === $pluginManager) { - $pluginManager = new ExtensionPluginManager(); + $pluginManager = new StandaloneExtensionManager(); } $this->pluginManager = $pluginManager; } @@ -37,7 +37,7 @@ public function __construct(ExtensionPluginManager $pluginManager = null) /** * Method overloading * - * Proxy to composed ExtensionPluginManager instance. + * Proxy to composed ExtensionManagerInterface instance. * * @param string $method * @param array $args diff --git a/vendor/zendframework/zend-feed/src/Writer/Writer.php b/vendor/zendframework/zend-feed/src/Writer/Writer.php index a4f95bf..4c1e257 100644 --- a/vendor/zendframework/zend-feed/src/Writer/Writer.php +++ b/vendor/zendframework/zend-feed/src/Writer/Writer.php @@ -105,13 +105,16 @@ public static function registerExtension($name) return; } } - if (!$manager->has($feedName) - && !$manager->has($entryName) - && !$manager->has($feedRendererName) - && !$manager->has($entryRendererName) + if (! $manager->has($feedName) + && ! $manager->has($entryName) + && ! $manager->has($feedRendererName) + && ! $manager->has($entryRendererName) ) { - throw new Exception\RuntimeException('Could not load extension: ' . $name - . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); + throw new Exception\RuntimeException(sprintf( + 'Could not load extension "%s" using Plugin Loader. ' + . 'Check prefix paths are configured and extension exists.', + $name + )); } if ($manager->has($feedName)) { static::$extensions['feed'][] = $feedName; diff --git a/vendor/zendframework/zend-stdlib/CHANGELOG.md b/vendor/zendframework/zend-stdlib/CHANGELOG.md index 5ce14e6..72b09ab 100644 --- a/vendor/zendframework/zend-stdlib/CHANGELOG.md +++ b/vendor/zendframework/zend-stdlib/CHANGELOG.md @@ -2,6 +2,26 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.7.4 - 2015-10-15 + +### Added + +- Nothing. + +### Deprecated + +- [#35](https://github.com/zendframework/zend-stdlib/pull/35) deprecates + `Zend\Stdlib\CallbackHandler`, as the one component that used it, + zend-eventmanager, will no longer depend on it starting in v3. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + ## 2.7.3 - 2015-09-24 ### Added diff --git a/vendor/zendframework/zend-stdlib/src/CallbackHandler.php b/vendor/zendframework/zend-stdlib/src/CallbackHandler.php index dc6bc74..dc9bfd5 100644 --- a/vendor/zendframework/zend-stdlib/src/CallbackHandler.php +++ b/vendor/zendframework/zend-stdlib/src/CallbackHandler.php @@ -17,6 +17,11 @@ * A handler for an event, event, filterchain, etc. Abstracts PHP callbacks, * primarily to allow for lazy-loading and ensuring availability of default * arguments (currying). + * + * This was primarily used in zend-eventmanager for managing listeners; as that + * component removes its usage of this class for v3, it is deprecated. + * + * @deprecated as of v2.7.4. */ class CallbackHandler {