diff --git a/composer.lock b/composer.lock index 9d589c8..7b6b1e8 100644 --- a/composer.lock +++ b/composer.lock @@ -1031,6 +1031,55 @@ "time": "2017-03-13T16:27:32+00:00" }, { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { "name": "psr/http-message", "version": "1.0.1", "source": { @@ -1237,16 +1286,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "c29a5bc6ca14cfff1f5e3d7781ed74b6e898d2b9" + "reference": "b0aff75bf18e4bbf37209235227e6e50a5aec8f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/c29a5bc6ca14cfff1f5e3d7781ed74b6e898d2b9", - "reference": "c29a5bc6ca14cfff1f5e3d7781ed74b6e898d2b9", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/b0aff75bf18e4bbf37209235227e6e50a5aec8f5", + "reference": "b0aff75bf18e4bbf37209235227e6e50a5aec8f5", "shasum": "" }, "require": { @@ -1262,7 +1311,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1289,20 +1338,20 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2017-02-18T17:28:00+00:00" + "time": "2017-04-12T14:14:56+00:00" }, { "name": "symfony/console", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd" + "reference": "0f0470206c5e0f768459fb07c3480683e43f5018" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/28fb243a2b5727774ca309ec2d92da240f1af0dd", - "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd", + "url": "https://api.github.com/repos/symfony/console/zipball/0f0470206c5e0f768459fb07c3480683e43f5018", + "reference": "0f0470206c5e0f768459fb07c3480683e43f5018", "shasum": "" }, "require": { @@ -1310,10 +1359,15 @@ "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.3" + }, "require-dev": { "psr/log": "~1.0", + "symfony/dependency-injection": "~3.3", "symfony/event-dispatcher": "~2.8|~3.0", "symfony/filesystem": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0", "symfony/process": "~2.8|~3.0" }, "suggest": { @@ -1325,7 +1379,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1352,20 +1406,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-03-06T19:30:27+00:00" + "time": "2017-04-29T09:46:23+00:00" }, { "name": "symfony/debug", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "56f613406446a4a0a031475cfd0a01751de22659" + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659", - "reference": "56f613406446a4a0a031475cfd0a01751de22659", + "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686", + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686", "shasum": "" }, "require": { @@ -1409,43 +1463,50 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-03-28T21:38:24+00:00" + "time": "2017-04-19T20:17:50+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "74e0935e414ad33d5e82074212c0eedb4681a691" + "reference": "949ad2d1cdc3759ffcce51d051595fa09978e3d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74e0935e414ad33d5e82074212c0eedb4681a691", - "reference": "74e0935e414ad33d5e82074212c0eedb4681a691", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/949ad2d1cdc3759ffcce51d051595fa09978e3d0", + "reference": "949ad2d1cdc3759ffcce51d051595fa09978e3d0", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.5.9", + "psr/container": "^1.0" }, "conflict": { - "symfony/yaml": "<3.2" + "symfony/config": "<3.3", + "symfony/finder": "<3.3", + "symfony/yaml": "<3.3" + }, + "provide": { + "psr/container-implementation": "1.0" }, "require-dev": { - "symfony/config": "~2.8|~3.0", + "symfony/config": "~3.3", "symfony/expression-language": "~2.8|~3.0", - "symfony/yaml": "~3.2" + "symfony/yaml": "~3.3" }, "suggest": { "symfony/config": "", "symfony/expression-language": "For using expressions in service container configuration", + "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1472,29 +1533,32 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-03-05T00:06:55+00:00" + "time": "2017-05-01T13:36:02+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d" + "reference": "145ec57e6d74270696e85a95e632227e8bde2faf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d", - "reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/145ec57e6d74270696e85a95e632227e8bde2faf", + "reference": "145ec57e6d74270696e85a95e632227e8bde2faf", "shasum": "" }, "require": { "php": ">=5.5.9" }, + "conflict": { + "symfony/dependency-injection": "<3.3" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/stopwatch": "~2.8|~3.0" }, @@ -1505,7 +1569,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1532,20 +1596,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-05-01T15:01:29+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "c57009887010eb4e58bfca2970314a5b820b24b9" + "reference": "af2d53e19912dbdcb347c7d8a75c5125c798f560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c57009887010eb4e58bfca2970314a5b820b24b9", - "reference": "c57009887010eb4e58bfca2970314a5b820b24b9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/af2d53e19912dbdcb347c7d8a75c5125c798f560", + "reference": "af2d53e19912dbdcb347c7d8a75c5125c798f560", "shasum": "" }, "require": { @@ -1558,7 +1622,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1585,20 +1649,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-03-04T12:23:14+00:00" + "time": "2017-05-01T15:01:29+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "bc909e85b8585c9edf043d0fca871308c41bb9b4" + "reference": "92defc24fd946c7cf9c1a2ca633df5eea943e6d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/bc909e85b8585c9edf043d0fca871308c41bb9b4", - "reference": "bc909e85b8585c9edf043d0fca871308c41bb9b4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/92defc24fd946c7cf9c1a2ca633df5eea943e6d2", + "reference": "92defc24fd946c7cf9c1a2ca633df5eea943e6d2", "shasum": "" }, "require": { @@ -1606,18 +1670,21 @@ "psr/log": "~1.0", "symfony/debug": "~2.8|~3.0", "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2" + "symfony/http-foundation": "~3.3" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.3", + "symfony/var-dumper": "<3.3" }, "require-dev": { + "psr/cache": "~1.0", "symfony/browser-kit": "~2.8|~3.0", "symfony/class-loader": "~2.8|~3.0", "symfony/config": "~2.8|~3.0", "symfony/console": "~2.8|~3.0", "symfony/css-selector": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/dom-crawler": "~2.8|~3.0", "symfony/expression-language": "~2.8|~3.0", "symfony/finder": "~2.8|~3.0", @@ -1626,7 +1693,7 @@ "symfony/stopwatch": "~2.8|~3.0", "symfony/templating": "~2.8|~3.0", "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~3.2" + "symfony/var-dumper": "~3.3" }, "suggest": { "symfony/browser-kit": "", @@ -1640,7 +1707,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1667,7 +1734,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-03-10T18:35:31+00:00" + "time": "2017-05-01T18:30:25+00:00" }, { "name": "symfony/polyfill-iconv", @@ -1789,16 +1856,16 @@ }, { "name": "symfony/process", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892" + "reference": "6edff1f0b99b99155b9a36cfb4349a58b04eeee5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/68bfa8c83f24c0ac04ea7193bcdcda4519f41892", - "reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892", + "url": "https://api.github.com/repos/symfony/process/zipball/6edff1f0b99b99155b9a36cfb4349a58b04eeee5", + "reference": "6edff1f0b99b99155b9a36cfb4349a58b04eeee5", "shasum": "" }, "require": { @@ -1807,7 +1874,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1834,7 +1901,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-03-04T12:23:14+00:00" + "time": "2017-04-29T15:36:12+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -1898,32 +1965,35 @@ }, { "name": "symfony/routing", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d6605f9a5767bc5bc4895e1c762ba93964608aee" + "reference": "fadf93908abafa12bed07680faf52c41c7038317" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d6605f9a5767bc5bc4895e1c762ba93964608aee", - "reference": "d6605f9a5767bc5bc4895e1c762ba93964608aee", + "url": "https://api.github.com/repos/symfony/routing/zipball/fadf93908abafa12bed07680faf52c41c7038317", + "reference": "fadf93908abafa12bed07680faf52c41c7038317", "shasum": "" }, "require": { "php": ">=5.5.9" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.3", + "symfony/yaml": "<3.3" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0" + "symfony/yaml": "~3.3" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -1936,7 +2006,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1969,29 +2039,30 @@ "uri", "url" ], - "time": "2017-03-02T15:58:09+00:00" + "time": "2017-04-13T13:45:25+00:00" }, { "name": "symfony/serializer", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "a51ec869cd38d3732ee4092b2e511d9381847c0a" + "reference": "c8d1ce30e172140cec7a83bdd5faa8af75bc4c5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/a51ec869cd38d3732ee4092b2e511d9381847c0a", - "reference": "a51ec869cd38d3732ee4092b2e511d9381847c0a", + "url": "https://api.github.com/repos/symfony/serializer/zipball/c8d1ce30e172140cec7a83bdd5faa8af75bc4c5b", + "reference": "c8d1ce30e172140cec7a83bdd5faa8af75bc4c5b", "shasum": "" }, "require": { "php": ">=5.5.9" }, "conflict": { + "symfony/dependency-injection": "<3.2", "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4", "symfony/property-info": "<3.1", - "symfony/yaml": "<3.1" + "symfony/yaml": "<3.3" }, "require-dev": { "doctrine/annotations": "~1.0", @@ -1999,10 +2070,11 @@ "phpdocumentor/reflection-docblock": "~3.0", "symfony/cache": "~3.1", "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~3.2", "symfony/http-foundation": "~2.8|~3.0", "symfony/property-access": "~2.8|~3.0", "symfony/property-info": "~3.1", - "symfony/yaml": "~3.1" + "symfony/yaml": "~3.3" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", @@ -2017,7 +2089,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -2044,20 +2116,20 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2017-03-05T17:42:14+00:00" + "time": "2017-05-01T15:01:29+00:00" }, { "name": "symfony/translation", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690" + "reference": "2a6f7a97421875ea66ace2fc943c2303d4d2289d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690", - "reference": "0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690", + "url": "https://api.github.com/repos/symfony/translation/zipball/2a6f7a97421875ea66ace2fc943c2303d4d2289d", + "reference": "2a6f7a97421875ea66ace2fc943c2303d4d2289d", "shasum": "" }, "require": { @@ -2065,13 +2137,14 @@ "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/yaml": "<3.3" }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", "symfony/intl": "^2.8.18|^3.2.5", - "symfony/yaml": "~2.8|~3.0" + "symfony/yaml": "~3.3" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -2081,7 +2154,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -2108,20 +2181,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-03-04T12:23:14+00:00" + "time": "2017-04-12T14:14:56+00:00" }, { "name": "symfony/validator", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "6a67585f0d2a5cf407cf6cfa53095881dcb0f549" + "reference": "98c24f2324cd198be31c796d663fbdea5bb48f80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/6a67585f0d2a5cf407cf6cfa53095881dcb0f549", - "reference": "6a67585f0d2a5cf407cf6cfa53095881dcb0f549", + "url": "https://api.github.com/repos/symfony/validator/zipball/98c24f2324cd198be31c796d663fbdea5bb48f80", + "reference": "98c24f2324cd198be31c796d663fbdea5bb48f80", "shasum": "" }, "require": { @@ -2130,7 +2203,9 @@ "symfony/translation": "~2.8|~3.0" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", + "symfony/dependency-injection": "<3.3", + "symfony/yaml": "<3.3" }, "require-dev": { "doctrine/annotations": "~1.0", @@ -2138,10 +2213,11 @@ "egulias/email-validator": "^1.2.8|~2.0", "symfony/cache": "~3.1", "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", "symfony/intl": "^2.8.18|^3.2.5", - "symfony/yaml": "~2.8|~3.0" + "symfony/yaml": "~3.3" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", @@ -2158,7 +2234,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -2185,20 +2261,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2017-02-28T02:30:50+00:00" + "time": "2017-04-13T13:45:25+00:00" }, { "name": "symfony/yaml", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a" + "reference": "dcbd318c241341c82444a8d92b7a0ddf6419f496" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a", - "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/dcbd318c241341c82444a8d92b7a0ddf6419f496", + "reference": "dcbd318c241341c82444a8d92b7a0ddf6419f496", "shasum": "" }, "require": { @@ -2213,7 +2289,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -2240,7 +2316,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-03-07T16:47:02+00:00" + "time": "2017-05-01T15:01:29+00:00" }, { "name": "twig/twig", @@ -4010,16 +4086,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8" + "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2fe0caa60c1a1dfeefd0425741182687a9b382b8", - "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9fab1ab6f77b77f3df5fc5250fc6956811699b57", + "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57", "shasum": "" }, "require": { @@ -4063,20 +4139,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/css-selector", - "version": "v3.2.6", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c" + "reference": "4d882dced7b995d5274293039370148e291808f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c", - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4d882dced7b995d5274293039370148e291808f2", + "reference": "4d882dced7b995d5274293039370148e291808f2", "shasum": "" }, "require": { @@ -4085,7 +4161,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -4116,20 +4192,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-05-01T15:01:29+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee" + "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/403944e294cf4ceb3b8447f54cbad88ea7b99cee", - "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f1ad34e8af09ed17570e027cf0c58a12eddec286", + "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286", "shasum": "" }, "require": { @@ -4172,27 +4248,27 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v3.2.8", + "version": "v3.3.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "00916603c524b8048906de460b7ea0dfa1651281" + "reference": "9706535602ce13c31aee49ccee5d6bfd895aadb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/00916603c524b8048906de460b7ea0dfa1651281", - "reference": "00916603c524b8048906de460b7ea0dfa1651281", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/9706535602ce13c31aee49ccee5d6bfd895aadb5", + "reference": "9706535602ce13c31aee49ccee5d6bfd895aadb5", "shasum": "" }, "require": { "php": ">=5.3.3" }, "conflict": { - "phpunit/phpunit": ">=6.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, "suggest": { "ext-zip": "Zip support is required when using bin/simple-phpunit", @@ -4204,7 +4280,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -4234,7 +4310,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12T14:14:56+00:00" } ], "aliases": [], diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 42601e2..0bb060d 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -296,7 +296,7 @@ Menu UI - ? Node -- Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood +- ? Node Access - Ken Rickard 'agentrickard' https://www.drupal.org/u/agentrickard @@ -474,9 +474,11 @@ re-architect or otherwise improve large areas of Drupal core. See https://www.drupal.org/community-initiatives/drupal-core for more information on their responsibilities. The initiative coordinators for Drupal 8 are: -API-first Initiative -- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers -- Mateu Aguiló Bosch 'e0ipso' https://www.drupal.org/u/e0ipso +Workflow Initiative +- Dick Olsson 'dixon_' https://www.drupal.org/u/dixon_ + +PHPUnit Initiative +- Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner Layout Initiative - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett @@ -485,13 +487,6 @@ Layout Initiative Media Initiative - Janez Urevc 'slashrsm' https://www.drupal.org/u/slashrsm -PHPUnit Initiative -- Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner - -Workflow Initiative -- Dick Olsson 'dixon_' https://www.drupal.org/u/dixon_ - - Provisional membership: None at this time. diff --git a/core/composer.json b/core/composer.json index 0be4b81..5af00d1 100644 --- a/core/composer.json +++ b/core/composer.json @@ -5,19 +5,19 @@ "license": "GPL-2.0+", "require": { "php": ">=5.5.9", - "symfony/class-loader": "3.2.6", - "symfony/console": "3.2.6", - "symfony/dependency-injection": "3.2.6", - "symfony/event-dispatcher": "3.2.6", - "symfony/http-foundation": "3.2.6", - "symfony/http-kernel": "3.2.6", - "symfony/routing": "3.2.6", - "symfony/serializer": "3.2.6", - "symfony/translation": "3.2.6", - "symfony/validator": "3.2.6", - "symfony/process": "3.2.6", + "symfony/class-loader": "3.3-beta1", + "symfony/console": "3.3-beta1", + "symfony/dependency-injection": "3.3-beta1", + "symfony/event-dispatcher": "3.3-beta1", + "symfony/http-foundation": "3.3-beta1", + "symfony/http-kernel": "3.3-beta1", + "symfony/routing": "3.3-beta1", + "symfony/serializer": "3.3-beta1", + "symfony/translation": "3.3-beta1", + "symfony/validator": "3.3-beta1", + "symfony/process": "3.3-beta1", "symfony/polyfill-iconv": "~1.0", - "symfony/yaml": "3.2.6", + "symfony/yaml": "3.3-beta1", "twig/twig": "^1.23.1", "doctrine/common": "^2.5", "doctrine/annotations": "1.2.*", @@ -45,8 +45,8 @@ "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", "mikey179/vfsStream": "~1.2", "phpunit/phpunit": ">=4.8.35 <5", - "symfony/css-selector": "3.2.6", - "symfony/phpunit-bridge": "^3.2" + "symfony/css-selector": "3.3-beta1", + "symfony/phpunit-bridge": "3.3-beta1" }, "replace": { "drupal/action": "self.version", diff --git a/core/lib/Drupal/Component/Serialization/YamlSymfony.php b/core/lib/Drupal/Component/Serialization/YamlSymfony.php index d35e09c..390178f 100644 --- a/core/lib/Drupal/Component/Serialization/YamlSymfony.php +++ b/core/lib/Drupal/Component/Serialization/YamlSymfony.php @@ -17,8 +17,8 @@ class YamlSymfony implements SerializationInterface { */ public static function encode($data) { try { - // Set the indentation to 2 to match Drupal's coding standards. - $yaml = new Dumper(2); + $yaml = new Dumper(); + $yaml->setIndentation(2); return $yaml->dump($data, PHP_INT_MAX, 0, SymfonyYaml::DUMP_EXCEPTION_ON_INVALID_TYPE); } catch (\Exception $e) { diff --git a/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php b/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php index e3e4895..cf4cd89 100644 --- a/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php +++ b/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php @@ -59,23 +59,23 @@ public static function setSettingsOnRequest(Request $request, Settings $settings // Initialize proxy settings. if ($settings->get('reverse_proxy', FALSE)) { $ip_header = $settings->get('reverse_proxy_header', 'X_FORWARDED_FOR'); - $request::setTrustedHeaderName($request::HEADER_CLIENT_IP, $ip_header); + $request::setTrustedHeaderName($request::HEADER_X_FORWARDED_FOR, $ip_header); $proto_header = $settings->get('reverse_proxy_proto_header', 'X_FORWARDED_PROTO'); - $request::setTrustedHeaderName($request::HEADER_CLIENT_PROTO, $proto_header); + $request::setTrustedHeaderName($request::HEADER_X_FORWARDED_PROTO, $proto_header); $host_header = $settings->get('reverse_proxy_host_header', 'X_FORWARDED_HOST'); - $request::setTrustedHeaderName($request::HEADER_CLIENT_HOST, $host_header); + $request::setTrustedHeaderName($request::HEADER_X_FORWARDED_HOST, $host_header); $port_header = $settings->get('reverse_proxy_port_header', 'X_FORWARDED_PORT'); - $request::setTrustedHeaderName($request::HEADER_CLIENT_PORT, $port_header); + $request::setTrustedHeaderName($request::HEADER_X_FORWARDED_PORT, $port_header); $forwarded_header = $settings->get('reverse_proxy_forwarded_header', 'FORWARDED'); $request::setTrustedHeaderName($request::HEADER_FORWARDED, $forwarded_header); $proxies = $settings->get('reverse_proxy_addresses', []); if (count($proxies) > 0) { - $request::setTrustedProxies($proxies); + $request::setTrustedProxies($proxies, Request::HEADER_X_FORWARDED_ALL | Request::HEADER_FORWARDED); } } } diff --git a/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php b/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php new file mode 100644 index 0000000..dd2e67e --- /dev/null +++ b/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php @@ -0,0 +1,76 @@ +sourceDatabase->update('variable') + ->fields([ + 'value' => $value + ]) + ->condition('name', 'language_default' ) + ->execute(); + + $this->startCollectingMessages(); + $this->executeMigrations(['language', 'default_language']); + + if ($existing) { + // If the default language exists, we should be able to load it and the + // default_langcode config should be set. + $default_language = ConfigurableLanguage::load($langcode); + $this->assertNotNull($default_language); + $this->assertSame($langcode, $this->config('system.site')->get('default_langcode')); + } + else { + // Otherwise, the migration log should contain an error message. + $messages = $this->migration->getIdMap()->getMessageIterator(); + $count = 0; + foreach ($messages as $message) { + $count++; + $this->assertSame($message->message, "The language '$langcode' does not exist on this site."); + $this->assertSame((int) $message->level, MigrationInterface::MESSAGE_ERROR); + } + $this->assertSame($count, 1); + } + } + + /** + * Helper method to test migrating the default language when no default language is set. + */ + protected function doTestMigrationWithUnsetVariable() { + // Delete the language_default variable. + $this->sourceDatabase->delete('variable') + ->condition('name', 'language_default' ) + ->execute(); + + $this->startCollectingMessages(); + $this->executeMigrations(['language', 'default_language']); + $messages = $this->migration->getIdMap()->getMessageIterator()->fetchAll(); + + // Make sure there's no migration exceptions. + $this->assertEmpty($messages); + + // Make sure the default langcode is 'en', since it was the default on D6 & D7. + $this->assertSame('en', $this->config('system.site')->get('default_langcode')); + } + +} diff --git a/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateDefaultLanguageTest.php b/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateDefaultLanguageTest.php index 290160c..645af29 100644 --- a/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateDefaultLanguageTest.php +++ b/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateDefaultLanguageTest.php @@ -2,8 +2,7 @@ namespace Drupal\Tests\language\Kernel\Migrate\d6; -use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\migrate\Plugin\MigrationInterface; +use Drupal\Tests\language\Kernel\Migrate\MigrateDefaultLanguageTrait; use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase; /** @@ -13,6 +12,8 @@ */ class MigrateDefaultLanguageTest extends MigrateDrupal6TestBase { + use MigrateDefaultLanguageTrait; + /** * {@inheritdoc} */ @@ -22,68 +23,21 @@ class MigrateDefaultLanguageTest extends MigrateDrupal6TestBase { * Tests language_default migration with an existing language. */ public function testMigrationWithExistingLanguage() { - $this->setDefaultLanguage('fr'); - $this->startCollectingMessages(); - $this->executeMigrations(['language', 'default_language']); - - // Tests the language is loaded and is the default language. - $default_language = ConfigurableLanguage::load('fr'); - $this->assertNotNull($default_language); - $this->assertSame('fr', $this->config('system.site')->get('default_langcode')); + $this->doTestMigration('fr'); } /** * Tests language_default migration with a non-existing language. */ public function testMigrationWithNonExistentLanguage() { - $this->setDefaultLanguage('tv'); - $this->startCollectingMessages(); - $this->executeMigrations(['language', 'default_language']); - - // Tests the migration log contains an error message. - $messages = $this->migration->getIdMap()->getMessageIterator(); - $count = 0; - foreach ($messages as $message) { - $count++; - $this->assertSame($message->message, "The language 'tv' does not exist on this site."); - $this->assertSame((int) $message->level, MigrationInterface::MESSAGE_ERROR); - } - $this->assertSame($count, 1); + $this->doTestMigration('tv', FALSE); } /** - * Tests language_default migration with unset default language variable. + * Tests language_default migration with unset variable. */ public function testMigrationWithUnsetVariable() { - // Delete the language_default variable. - $this->sourceDatabase->delete('variable') - ->condition('name', 'language_default') - ->execute(); - $this->startCollectingMessages(); - $this->executeMigrations(['language', 'default_language']); - - $messages = $this->migration->getIdMap()->getMessageIterator()->fetchAll(); - // Make sure there's no migration exceptions. - $this->assertEmpty($messages); - // Make sure the default langcode is 'en', as it was the default on D6 & D7. - $this->assertSame('en', $this->config('system.site')->get('default_langcode')); - } - - /** - * Helper method to test the migration. - * - * @param string $langcode - * The langcode of the default language. - */ - protected function setDefaultLanguage($langcode) { - // The default language of the test fixture is English. Change it to - // something else before migrating, to be sure that the source site - // default language is migrated. - $value = 'O:8:"stdClass":11:{s:8:"language";s:2:"' . $langcode . '";s:4:"name";s:6:"French";s:6:"native";s:6:"French";s:9:"direction";s:1:"0";s:7:"enabled";i:1;s:7:"plurals";s:1:"0";s:7:"formula";s:0:"";s:6:"domain";s:0:"";s:6:"prefix";s:0:"";s:6:"weight";s:1:"0";s:10:"javascript";s:0:"";}'; - $this->sourceDatabase->update('variable') - ->fields(['value' => $value]) - ->condition('name', 'language_default') - ->execute(); + $this->doTestMigrationWithUnsetVariable(); } } diff --git a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateDefaultLanguageTest.php b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateDefaultLanguageTest.php index ac7ca2e..79769bc 100644 --- a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateDefaultLanguageTest.php +++ b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateDefaultLanguageTest.php @@ -2,8 +2,7 @@ namespace Drupal\Tests\language\Kernel\Migrate\d7; -use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\migrate\Plugin\MigrationInterface; +use Drupal\Tests\language\Kernel\Migrate\MigrateDefaultLanguageTrait; use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase; /** @@ -13,6 +12,8 @@ */ class MigrateDefaultLanguageTest extends MigrateDrupal7TestBase { + use MigrateDefaultLanguageTrait; + /** * {@inheritdoc} */ @@ -22,68 +23,21 @@ class MigrateDefaultLanguageTest extends MigrateDrupal7TestBase { * Tests language_default migration with a non-existing language. */ public function testMigrationWithExistingLanguage() { - $this->setDefaultLanguage('is'); - $this->startCollectingMessages(); - $this->executeMigrations(['language', 'default_language']); - - // Tests the language is loaded and is the default language. - $default_language = ConfigurableLanguage::load('is'); - $this->assertNotNull($default_language); - $this->assertSame('is', $this->config('system.site')->get('default_langcode')); + $this->doTestMigration('is'); } /** * Tests language_default migration with a non-existing language. */ public function testMigrationWithNonExistentLanguage() { - $this->setDefaultLanguage('tv'); - $this->startCollectingMessages(); - $this->executeMigrations(['language', 'default_language']); - - // Tests the migration log contains an error message. - $messages = $this->migration->getIdMap()->getMessageIterator(); - $count = 0; - foreach ($messages as $message) { - $count++; - $this->assertSame($message->message, "The language 'tv' does not exist on this site."); - $this->assertSame((int) $message->level, MigrationInterface::MESSAGE_ERROR); - } - $this->assertSame($count, 1); + $this->doTestMigration('tv', FALSE); } /** - * Tests language_default migration with unset default language variable. + * Tests language_default migration with unset variable. */ public function testMigrationWithUnsetVariable() { - // Delete the language_default variable. - $this->sourceDatabase->delete('variable') - ->condition('name', 'language_default') - ->execute(); - $this->startCollectingMessages(); - $this->executeMigrations(['language', 'default_language']); - - $messages = $this->migration->getIdMap()->getMessageIterator()->fetchAll(); - // Make sure there's no migration exceptions. - $this->assertEmpty($messages); - // Make sure the default langcode is 'en', as it was the default on D6 & D7. - $this->assertSame('en', $this->config('system.site')->get('default_langcode')); - } - - /** - * Helper method to test the migration. - * - * @param string $langcode - * The langcode of the default language. - */ - protected function setDefaultLanguage($langcode) { - // The default language of the test fixture is English. Change it to - // something else before migrating, to be sure that the source site - // default language is migrated. - $value = 'O:8:"stdClass":11:{s:8:"language";s:2:"' . $langcode . '";s:4:"name";s:6:"French";s:6:"native";s:6:"French";s:9:"direction";s:1:"0";s:7:"enabled";i:1;s:7:"plurals";s:1:"0";s:7:"formula";s:0:"";s:6:"domain";s:0:"";s:6:"prefix";s:0:"";s:6:"weight";s:1:"0";s:10:"javascript";s:0:"";}'; - $this->sourceDatabase->update('variable') - ->fields(['value' => $value]) - ->condition('name', 'language_default') - ->execute(); + $this->doTestMigrationWithUnsetVariable(); } } diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php index 27b7569..14a0a7a 100644 --- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php +++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php @@ -174,7 +174,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * Retrieves the hash of the source identifier values. * - * @internal + * It is public only for testing purposes. * * @param array $source_id_values * The source identifiers diff --git a/core/modules/migrate/src/Row.php b/core/modules/migrate/src/Row.php index 95e7f28..2824dd9 100644 --- a/core/modules/migrate/src/Row.php +++ b/core/modules/migrate/src/Row.php @@ -106,11 +106,10 @@ public function __construct(array $values = [], array $source_ids = [], $is_stub * Retrieves the values of the source identifiers. * * @return array - * An array containing the values of the source identifiers. Returns values - * in the same order as defined in $this->sourceIds. + * An array containing the values of the source identifiers. */ public function getSourceIdValues() { - return array_merge($this->sourceIds, array_intersect_key($this->source, $this->sourceIds)); + return array_intersect_key($this->source, $this->sourceIds); } /** diff --git a/core/modules/migrate/tests/src/Unit/RowTest.php b/core/modules/migrate/tests/src/Unit/RowTest.php index 9a20bda..10d7d7d 100644 --- a/core/modules/migrate/tests/src/Unit/RowTest.php +++ b/core/modules/migrate/tests/src/Unit/RowTest.php @@ -193,39 +193,6 @@ public function testSourceIdValues() { } /** - * Tests the multiple source IDs. - */ - public function testMultipleSourceIdValues() { - // Set values in same order as ids. - $multi_source_ids = $this->testSourceIds + [ - 'vid' => 'Node revision', - 'type' => 'Node type', - 'langcode' => 'Node language', - ]; - $multi_source_ids_values = $this->testValues + [ - 'vid' => 1, - 'type' => 'page', - 'langcode' => 'en', - ]; - $row = new Row($multi_source_ids_values, $multi_source_ids); - $this->assertSame(array_keys($multi_source_ids), array_keys($row->getSourceIdValues())); - - // Set values in different order. - $multi_source_ids = $this->testSourceIds + [ - 'vid' => 'Node revision', - 'type' => 'Node type', - 'langcode' => 'Node language', - ]; - $multi_source_ids_values = $this->testValues + [ - 'langcode' => 'en', - 'type' => 'page', - 'vid' => 1, - ]; - $row = new Row($multi_source_ids_values, $multi_source_ids); - $this->assertSame(array_keys($multi_source_ids), array_keys($row->getSourceIdValues())); - } - - /** * Tests getting the source property. * * @covers ::getSourceProperty diff --git a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php index 3775334..a5daa72 100644 --- a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php +++ b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php @@ -2,6 +2,9 @@ namespace Drupal\Tests\migrate\Unit\process; +@trigger_error('The ' . __NAMESPACE__ . '\DedupeEntityTest is deprecated in +Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use ' . __NAMESPACE__ . '\MakeUniqueEntityFieldTest', E_USER_DEPRECATED); + use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\Query\QueryInterface; @@ -11,7 +14,6 @@ /** * @coversDefaultClass \Drupal\migrate\Plugin\migrate\process\DedupeEntity * @group migrate - * @group legacy */ class DedupeEntityTest extends MigrateProcessTestCase { diff --git a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php index cade905..843d1e5 100644 --- a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php +++ b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php @@ -2,6 +2,9 @@ namespace Drupal\Tests\migrate\Unit\process; +@trigger_error('The ' . __NAMESPACE__ . '\MigrationTest is deprecated in +Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use ' . __NAMESPACE__ . '\MigrationLookupTest', E_USER_DEPRECATED); + use Drupal\Core\Entity\EntityStorageInterface; use Drupal\migrate\MigrateSkipProcessException; use Drupal\migrate\Plugin\MigrationInterface; @@ -14,9 +17,11 @@ use Prophecy\Argument; /** + * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use + * \Drupal\Tests\migrate\Unit\process\MigrationLookupTest instead. + * * @coversDefaultClass \Drupal\migrate\Plugin\migrate\process\Migration * @group migrate - * @group legacy */ class MigrationTest extends MigrateProcessTestCase { diff --git a/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php b/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php index e032cef..324bf1d 100644 --- a/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php +++ b/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php @@ -35,9 +35,9 @@ public function testOutput() { // Check that there are
tags for the HTML output by // SimpletestUiPrinter. - $this->assertEqual($output[19], 'HTML output was generated
'); + $this->assertEqual($output[18], 'HTML output was generated
'); // Check that URLs are printed as HTML links. - $this->assertIdentical(strpos($output[20], ' - - diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Core/Session/SessionTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Core/Session/SessionTest.php index e02e0df..fa2d541 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/Core/Session/SessionTest.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/Core/Session/SessionTest.php @@ -48,13 +48,10 @@ public function testSessionExpiration() { // number of times. $this->drupalGet(''); - $session_assert = $this->assertSession(); - $page = $this->getSession()->getPage(); for ($i = 0; $i < 25; $i++) { $page->clickLink('Link to front page'); - $session_assert->statusCodeEquals(200); } } diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php b/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php index 81d379f..94b5d4c 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php @@ -366,4 +366,60 @@ function t(r, lx, ly) { return $this->session->evaluateScript($full_javascript_visibility_test); } + /** + * The use of statusCodeEquals() is not available. + * + * @param int $code + * The status code. + * + * @throws \Behat\Mink\Exception\UnsupportedDriverActionException + * Throws an exception on use. + */ + public function statusCodeEquals($code) { + throw new UnsupportedDriverActionException('The use of statusCodeEquals() is not available in a functional JavaScript test.'); + } + + /** + * The use of statusCodeNotEquals() is not available. + * + * @param int $code + * The status code. + * + * @throws \Behat\Mink\Exception\UnsupportedDriverActionException + * Throws an exception on use. + */ + public function statusCodeNotEquals($code) { + throw new UnsupportedDriverActionException('The use of statusCodeNotEquals() is not available in a functional JavaScript test.'); + } + + /** + * The use of responseHeaderEquals() is not available. + * + * @param string $name + * The name of the header. + * @param string $value + * The value to check the header against. + * + * @throws \Behat\Mink\Exception\UnsupportedDriverActionException + * Throws an exception on use. + */ + public function responseHeaderEquals($name, $value) { + throw new UnsupportedDriverActionException('The use of responseHeaderEquals() is not available in a functional JavaScript test.'); + } + + /** + * The use of responseHeaderNotEquals() is not available. + * + * @param string $name + * The name of the header. + * @param string $value + * The value to check the header against. + * + * @throws \Behat\Mink\Exception\UnsupportedDriverActionException + * Throws an exception on use. + */ + public function responseHeaderNotEquals($name, $value) { + throw new UnsupportedDriverActionException('The use of responseHeaderNotEquals() is not available in a functional JavaScript test.'); + } + } diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php index 5751368..533e974 100644 --- a/core/tests/Drupal/Tests/BrowserTestBase.php +++ b/core/tests/Drupal/Tests/BrowserTestBase.php @@ -715,7 +715,6 @@ protected function drupalLogin(AccountInterface $account) { } $this->drupalGet('user/login'); - $this->assertSession()->statusCodeEquals(200); $this->submitForm([ 'name' => $account->getUsername(), 'pass' => $account->passRaw, @@ -740,7 +739,6 @@ protected function drupalLogout() { // screen. $assert_session = $this->assertSession(); $this->drupalGet('user/logout', ['query' => ['destination' => 'user']]); - $assert_session->statusCodeEquals(200); $assert_session->fieldExists('name'); $assert_session->fieldExists('pass'); diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index 038e018..41ed964 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -212,8 +212,6 @@ public function getParametersDataProvider() { * @covers ::getParameterCall * * @dataProvider getDefinitionsDataProvider - * - * @group legacy */ public function testGetServiceDefinitions($services, $definition_services) { $this->containerDefinition['services'] = $definition_services; @@ -479,8 +477,6 @@ protected function getServiceCall($id, $invalid_behavior = ContainerInterface::E * @covers ::getReferenceCall * * @dataProvider publicPrivateDataProvider - * - * @group legacy */ public function testGetServiceDefinitionWithReferenceToAlias($public) { $bar_definition = new Definition('\stdClass'); @@ -536,8 +532,6 @@ public function publicPrivateDataProvider() { * getDecoratedService(). * * @covers ::getServiceDefinition - * - * @group legacy */ public function testGetServiceDefinitionForDecoratedService() { $bar_definition = new Definition('\stdClass'); diff --git a/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php b/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php index 841ac05..7f992bd 100644 --- a/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php +++ b/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php @@ -66,7 +66,6 @@ public function testGetFileExtension() { * @dataProvider providerYamlFilesInCore */ public function testYamlFiles($file) { - file_put_contents('/tmp/dup.txt', $file . "\n", FILE_APPEND); $data = file_get_contents($file); try { $this->assertEquals(YamlSymfony::decode($data), YamlPecl::decode($data), $file); diff --git a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php index edd7b13..d2d7b85 100644 --- a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php +++ b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php @@ -14,7 +14,6 @@ /** * @coversDefaultClass \Drupal\FunctionalTests\AssertLegacyTrait * @group Assert - * @group legacy */ class AssertLegacyTraitTest extends UnitTestCase { diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php index 0b7aa25..28040a6 100644 --- a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php @@ -70,8 +70,6 @@ protected function setUp() { * * @see \Drupal\Core\Controller\ControllerResolver::getArguments() * @see \Drupal\Core\Controller\ControllerResolver::doGetArguments() - * - * @group legacy */ public function testGetArguments() { $controller = function(EntityInterface $entity, $user, RouteMatchInterface $route_match, ServerRequestInterface $psr_7) { @@ -222,8 +220,6 @@ protected function assertCallableController($controller, $class, $output) { * * @covers ::getArguments * @covers ::doGetArguments - * - * @group legacy */ public function testGetArgumentsWithRouteMatchAndRequest() { $request = Request::create('/test'); @@ -237,8 +233,6 @@ public function testGetArgumentsWithRouteMatchAndRequest() { * * @covers ::getArguments * @covers ::doGetArguments - * - * @group legacy */ public function testGetArgumentsWithRouteMatchAndPsr7Request() { $request = Request::create('/test'); diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php index c9bccce..b9dc671 100644 --- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php +++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php @@ -261,8 +261,6 @@ public function testChainAddRemoveClasses() { * * @covers ::removeClass * @covers ::addClass - * - * @group legacy */ public function testTwigAddRemoveClasses($template, $expected, $seed_attributes = []) { $loader = new \Twig_Loader_String(); diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index a872e30..c4805bc 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -15,7 +15,6 @@ * Tests the twig extension. * * @group Template - * @group legacy * * @coversDefaultClass \Drupal\Core\Template\TwigExtension */ @@ -74,8 +73,6 @@ public function setUp() { * Tests the escaping * * @dataProvider providerTestEscaping - * - * @group legacy */ public function testEscaping($template, $expected) { $twig = new \Twig_Environment(NULL, [ @@ -126,8 +123,6 @@ public function providerTestEscaping() { /** * Tests the active_theme function. - * - * @group legacy */ public function testActiveTheme() { $active_theme = $this->getMockBuilder('\Drupal\Core\Theme\ActiveTheme') @@ -188,8 +183,6 @@ public function testActiveThemePath() { * Tests the escaping of objects implementing MarkupInterface. * * @covers ::escapeFilter - * - * @group legacy */ public function testSafeStringEscaping() { $twig = new \Twig_Environment(NULL, [ @@ -274,8 +267,6 @@ public function providerTestRenderVar() { /** * @covers ::escapeFilter * @covers ::bubbleArgMetadata - * - * @group legacy */ public function testEscapeWithGeneratedLink() { $twig = new \Twig_Environment(NULL, [ diff --git a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php index 1bbb9f4..e599463 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php @@ -16,7 +16,6 @@ * Tests the twig sandbox policy. * * @group Template - * @group legacy * * @coversDefaultClass \Drupal\Core\Template\TwigSandboxPolicy */