diff --git a/composer.lock b/composer.lock
index 05ca71eec5..3bd285bef6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -346,33 +346,38 @@
},
{
"name": "doctrine/cache",
- "version": "v1.6.2",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
+ "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
- "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
+ "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
"shasum": ""
},
"require": {
- "php": "~5.5|~7.0"
+ "php": "~7.1"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
- "phpunit/phpunit": "~4.8|~5.0",
- "predis/predis": "~1.0",
- "satooshi/php-coveralls": "~0.6"
+ "alcaeus/mongo-php-adapter": "^1.1",
+ "doctrine/coding-standard": "^4.0",
+ "mongodb/mongodb": "^1.1",
+ "phpunit/phpunit": "^7.0",
+ "predis/predis": "~1.0"
+ },
+ "suggest": {
+ "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -407,42 +412,45 @@
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
- "homepage": "http://www.doctrine-project.org",
+ "homepage": "https://www.doctrine-project.org",
"keywords": [
"cache",
"caching"
],
- "time": "2017-07-22T12:49:21+00:00"
+ "time": "2018-08-21T18:01:43+00:00"
},
{
"name": "doctrine/collections",
- "version": "v1.3.0",
+ "version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
+ "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
+ "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": "^7.1.3"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/coding-standard": "^6.0",
+ "phpstan/phpstan-shim": "^0.9.2",
+ "phpunit/phpunit": "^7.0",
+ "vimeo/psalm": "^3.2.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -471,44 +479,51 @@
"email": "schmittjoh@gmail.com"
}
],
- "description": "Collections Abstraction library",
- "homepage": "http://www.doctrine-project.org",
+ "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
+ "homepage": "https://www.doctrine-project.org/projects/collections.html",
"keywords": [
"array",
"collections",
- "iterator"
+ "iterators",
+ "php"
],
- "time": "2015-04-14T22:21:58+00:00"
+ "time": "2019-03-25T19:03:48+00:00"
},
{
"name": "doctrine/common",
- "version": "v2.6.2",
+ "version": "v2.10.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3"
+ "reference": "30e33f60f64deec87df728c02b107f82cdafad9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
- "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d",
+ "reference": "30e33f60f64deec87df728c02b107f82cdafad9d",
"shasum": ""
},
"require": {
- "doctrine/annotations": "1.*",
- "doctrine/cache": "1.*",
- "doctrine/collections": "1.*",
- "doctrine/inflector": "1.*",
- "doctrine/lexer": "1.*",
- "php": "~5.5|~7.0"
+ "doctrine/annotations": "^1.0",
+ "doctrine/cache": "^1.0",
+ "doctrine/collections": "^1.0",
+ "doctrine/event-manager": "^1.0",
+ "doctrine/inflector": "^1.0",
+ "doctrine/lexer": "^1.0",
+ "doctrine/persistence": "^1.1",
+ "doctrine/reflection": "^1.0",
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "~4.8|~5.0"
+ "doctrine/coding-standard": "^1.0",
+ "phpunit/phpunit": "^6.3",
+ "squizlabs/php_codesniffer": "^3.0",
+ "symfony/phpunit-bridge": "^4.0.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7.x-dev"
+ "dev-master": "2.10.x-dev"
}
},
"autoload": {
@@ -540,48 +555,124 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com"
+ },
+ {
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
}
],
- "description": "Common Library for Doctrine projects",
- "homepage": "http://www.doctrine-project.org",
+ "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.",
+ "homepage": "https://www.doctrine-project.org/projects/common.html",
"keywords": [
- "annotations",
- "collections",
- "eventmanager",
- "persistence",
- "spl"
+ "common",
+ "doctrine",
+ "php"
+ ],
+ "time": "2018-11-21T01:24:55+00:00"
+ },
+ {
+ "name": "doctrine/event-manager",
+ "version": "v1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/event-manager.git",
+ "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+ "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1"
+ },
+ "conflict": {
+ "doctrine/common": "<2.9@dev"
+ },
+ "require-dev": {
+ "doctrine/coding-standard": "^4.0",
+ "phpunit/phpunit": "^7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Common\\": "lib/Doctrine/Common"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "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": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
+ }
+ ],
+ "description": "Doctrine Event Manager component",
+ "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
+ "keywords": [
+ "event",
+ "eventdispatcher",
+ "eventmanager"
],
- "time": "2016-11-30T16:50:46+00:00"
+ "time": "2018-06-11T11:59:03+00:00"
},
{
"name": "doctrine/inflector",
- "version": "v1.1.0",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
- "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+ "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
- "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
+ "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^6.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Inflector\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -618,7 +709,7 @@
"singularize",
"string"
],
- "time": "2015-11-06T14:35:42+00:00"
+ "time": "2018-01-09T20:05:19+00:00"
},
{
"name": "doctrine/lexer",
@@ -674,6 +765,163 @@
],
"time": "2014-09-09T13:34:57+00:00"
},
+ {
+ "name": "doctrine/persistence",
+ "version": "1.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/persistence.git",
+ "reference": "3da7c9d125591ca83944f477e65ed3d7b4617c48"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/persistence/zipball/3da7c9d125591ca83944f477e65ed3d7b4617c48",
+ "reference": "3da7c9d125591ca83944f477e65ed3d7b4617c48",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/annotations": "^1.0",
+ "doctrine/cache": "^1.0",
+ "doctrine/collections": "^1.0",
+ "doctrine/event-manager": "^1.0",
+ "doctrine/reflection": "^1.0",
+ "php": "^7.1"
+ },
+ "conflict": {
+ "doctrine/common": "<2.10@dev"
+ },
+ "require-dev": {
+ "doctrine/coding-standard": "^5.0",
+ "phpstan/phpstan": "^0.8",
+ "phpunit/phpunit": "^7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Common\\": "lib/Doctrine/Common"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "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": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
+ }
+ ],
+ "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.",
+ "homepage": "https://doctrine-project.org/projects/persistence.html",
+ "keywords": [
+ "mapper",
+ "object",
+ "odm",
+ "orm",
+ "persistence"
+ ],
+ "time": "2019-04-23T08:28:24+00:00"
+ },
+ {
+ "name": "doctrine/reflection",
+ "version": "v1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/reflection.git",
+ "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6",
+ "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/annotations": "^1.0",
+ "ext-tokenizer": "*",
+ "php": "^7.1"
+ },
+ "require-dev": {
+ "doctrine/coding-standard": "^4.0",
+ "doctrine/common": "^2.8",
+ "phpstan/phpstan": "^0.9.2",
+ "phpstan/phpstan-phpunit": "^0.9.4",
+ "phpunit/phpunit": "^7.0",
+ "squizlabs/php_codesniffer": "^3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Common\\": "lib/Doctrine/Common"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "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": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
+ }
+ ],
+ "description": "Doctrine Reflection component",
+ "homepage": "https://www.doctrine-project.org/projects/reflection.html",
+ "keywords": [
+ "reflection"
+ ],
+ "time": "2018-06-14T14:45:07+00:00"
+ },
{
"name": "easyrdf/easyrdf",
"version": "0.9.1",
@@ -738,16 +986,16 @@
},
{
"name": "egulias/email-validator",
- "version": "2.1.7",
+ "version": "2.1.8",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e"
+ "reference": "c26463ff9241f27907112fbcd0c86fa670cfef98"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e",
- "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98",
+ "reference": "c26463ff9241f27907112fbcd0c86fa670cfef98",
"shasum": ""
},
"require": {
@@ -791,7 +1039,7 @@
"validation",
"validator"
],
- "time": "2018-12-04T22:38:24+00:00"
+ "time": "2019-05-16T22:02:54+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -911,32 +1159,33 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.4.2",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+ "reference": "9f83dded91781a01c63574e387eaa769be769115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
- "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
- "psr/http-message": "~1.0"
+ "psr/http-message": "~1.0",
+ "ralouphie/getallheaders": "^2.0.5"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -966,41 +1215,44 @@
"keywords": [
"http",
"message",
+ "psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
- "time": "2017-03-20T17:10:46+00:00"
+ "time": "2018-12-04T20:46:45+00:00"
},
{
"name": "masterminds/html5",
- "version": "2.3.0",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/Masterminds/html5-php.git",
- "reference": "2c37c6c520b995b761674de3be8455a381679067"
+ "reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/2c37c6c520b995b761674de3be8455a381679067",
- "reference": "2c37c6c520b995b761674de3be8455a381679067",
+ "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad",
+ "reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad",
"shasum": ""
},
"require": {
+ "ext-ctype": "*",
+ "ext-dom": "*",
"ext-libxml": "*",
"php": ">=5.3.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*",
+ "phpunit/phpunit": "^4.8.35",
"sami/sami": "~2.0",
"satooshi/php-coveralls": "1.0.*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1037,7 +1289,7 @@
"serializer",
"xml"
],
- "time": "2017-09-04T12:26:28+00:00"
+ "time": "2019-03-10T11:41:28+00:00"
},
{
"name": "paragonie/random_compat",
@@ -1090,16 +1342,16 @@
},
{
"name": "pear/archive_tar",
- "version": "1.4.6",
+ "version": "1.4.7",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "b8e33f9063a7cd1d20f079014f8382b3a7aee47e"
+ "reference": "7e48add6f8edc3027dd98ad15964b1a28fd0c845"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/b8e33f9063a7cd1d20f079014f8382b3a7aee47e",
- "reference": "b8e33f9063a7cd1d20f079014f8382b3a7aee47e",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/7e48add6f8edc3027dd98ad15964b1a28fd0c845",
+ "reference": "7e48add6f8edc3027dd98ad15964b1a28fd0c845",
"shasum": ""
},
"require": {
@@ -1152,20 +1404,20 @@
"archive",
"tar"
],
- "time": "2019-02-01T11:10:38+00:00"
+ "time": "2019-04-08T13:15:55+00:00"
},
{
"name": "pear/console_getopt",
- "version": "v1.4.1",
+ "version": "v1.4.2",
"source": {
"type": "git",
"url": "https://github.com/pear/Console_Getopt.git",
- "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f"
+ "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
- "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
+ "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0",
+ "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0",
"shasum": ""
},
"type": "library",
@@ -1199,20 +1451,20 @@
}
],
"description": "More info available on: http://pear.php.net/package/Console_Getopt",
- "time": "2015-07-20T20:28:12+00:00"
+ "time": "2019-02-06T16:52:33+00:00"
},
{
"name": "pear/pear-core-minimal",
- "version": "v1.10.7",
+ "version": "v1.10.9",
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "19a3e0fcd50492c4357372f623f55f1b144346da"
+ "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/19a3e0fcd50492c4357372f623f55f1b144346da",
- "reference": "19a3e0fcd50492c4357372f623f55f1b144346da",
+ "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/742be8dd68c746a01e4b0a422258e9c9cae1c37f",
+ "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f",
"shasum": ""
},
"require": {
@@ -1243,7 +1495,7 @@
}
],
"description": "Minimal set of PEAR core files to be used as composer dependency",
- "time": "2018-12-05T20:03:52+00:00"
+ "time": "2019-03-13T18:15:44+00:00"
},
{
"name": "pear/pear_exception",
@@ -1401,16 +1653,16 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -1444,7 +1696,47 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2018-11-20T15:27:04+00:00"
+ },
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "2.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7.0",
+ "satooshi/php-coveralls": ">=1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "time": "2016-02-11T07:05:27+00:00"
},
{
"name": "stack/builder",
@@ -1556,7 +1848,7 @@
},
{
"name": "symfony/class-loader",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
@@ -1612,7 +1904,7 @@
},
{
"name": "symfony/console",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
@@ -1684,7 +1976,7 @@
},
{
"name": "symfony/debug",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
@@ -1740,16 +2032,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "dee85a9148399cdb2731603802842bcfd8afe5ab"
+ "reference": "be0feb3fa202aedfd8d1956f2dafd563fb13acbf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/dee85a9148399cdb2731603802842bcfd8afe5ab",
- "reference": "dee85a9148399cdb2731603802842bcfd8afe5ab",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/be0feb3fa202aedfd8d1956f2dafd563fb13acbf",
+ "reference": "be0feb3fa202aedfd8d1956f2dafd563fb13acbf",
"shasum": ""
},
"require": {
@@ -1807,11 +2099,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2019-04-16T11:13:42+00:00"
+ "time": "2019-04-20T15:32:49+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -1928,16 +2220,16 @@
},
{
"name": "symfony/http-kernel",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "14fa41ccd38570b5e3120a3754bbaa144a15f311"
+ "reference": "586046f5adc6a08eaebbe4519ef18ad52f54e453"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/14fa41ccd38570b5e3120a3754bbaa144a15f311",
- "reference": "14fa41ccd38570b5e3120a3754bbaa144a15f311",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/586046f5adc6a08eaebbe4519ef18ad52f54e453",
+ "reference": "586046f5adc6a08eaebbe4519ef18ad52f54e453",
"shasum": ""
},
"require": {
@@ -2013,7 +2305,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2019-04-17T15:57:07+00:00"
+ "time": "2019-05-01T13:03:24+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -2252,7 +2544,7 @@
},
{
"name": "symfony/process",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -2301,25 +2593,27 @@
},
{
"name": "symfony/psr-http-message-bridge",
- "version": "v1.1.2",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "a33352af16f78a5ff4f9d90811536abf210df12b"
+ "reference": "9ab9d71f97d5c7d35a121a7fb69f74fee95cd0ad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a33352af16f78a5ff4f9d90811536abf210df12b",
- "reference": "a33352af16f78a5ff4f9d90811536abf210df12b",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/9ab9d71f97d5c7d35a121a7fb69f74fee95cd0ad",
+ "reference": "9ab9d71f97d5c7d35a121a7fb69f74fee95cd0ad",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0",
+ "php": "^7.1",
"psr/http-message": "^1.0",
- "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0"
+ "symfony/http-foundation": "^3.4 || ^4.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "^3.4 || ^4.0"
+ "nyholm/psr7": "^1.1",
+ "symfony/phpunit-bridge": "^3.4.20 || ^4.0",
+ "zendframework/zend-diactoros": "^1.4.1 || ^2.0"
},
"suggest": {
"nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
@@ -2327,7 +2621,7 @@
"type": "symfony-bridge",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
@@ -2360,11 +2654,11 @@
"psr-17",
"psr-7"
],
- "time": "2019-04-03T17:09:40+00:00"
+ "time": "2019-03-11T18:22:33+00:00"
},
{
"name": "symfony/routing",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
@@ -2440,16 +2734,16 @@
},
{
"name": "symfony/serializer",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "14b3221cc41dcfef404205f0060cda873f43a534"
+ "reference": "99aceeb3e10852b951b9cab57a2b83062db09efb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/14b3221cc41dcfef404205f0060cda873f43a534",
- "reference": "14b3221cc41dcfef404205f0060cda873f43a534",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/99aceeb3e10852b951b9cab57a2b83062db09efb",
+ "reference": "99aceeb3e10852b951b9cab57a2b83062db09efb",
"shasum": ""
},
"require": {
@@ -2472,7 +2766,7 @@
"symfony/dependency-injection": "~3.2|~4.0",
"symfony/http-foundation": "~2.8|~3.0|~4.0",
"symfony/property-access": "~2.8|~3.0|~4.0",
- "symfony/property-info": "~3.1|~4.0",
+ "symfony/property-info": "^3.4.13|~4.0",
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
@@ -2515,20 +2809,20 @@
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
- "time": "2019-04-11T05:44:34+00:00"
+ "time": "2019-04-27T21:20:35+00:00"
},
{
"name": "symfony/translation",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "aae26f143da71adc8707eb489f1dc86aef7d376b"
+ "reference": "301a5d627220a1c4ee522813b0028653af6c4f54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/aae26f143da71adc8707eb489f1dc86aef7d376b",
- "reference": "aae26f143da71adc8707eb489f1dc86aef7d376b",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/301a5d627220a1c4ee522813b0028653af6c4f54",
+ "reference": "301a5d627220a1c4ee522813b0028653af6c4f54",
"shasum": ""
},
"require": {
@@ -2585,20 +2879,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2019-04-10T16:00:48+00:00"
+ "time": "2019-05-01T11:10:09+00:00"
},
{
"name": "symfony/validator",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "83da5259779aaf9dde220130e62b785f74e2ac49"
+ "reference": "cc3f577d8887737df4d77a4c0cc6e3c22164cea4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/83da5259779aaf9dde220130e62b785f74e2ac49",
- "reference": "83da5259779aaf9dde220130e62b785f74e2ac49",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/cc3f577d8887737df4d77a4c0cc6e3c22164cea4",
+ "reference": "cc3f577d8887737df4d77a4c0cc6e3c22164cea4",
"shasum": ""
},
"require": {
@@ -2670,11 +2964,11 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
- "time": "2019-04-16T11:21:44+00:00"
+ "time": "2019-04-29T08:34:27+00:00"
},
{
"name": "symfony/yaml",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
@@ -2733,16 +3027,16 @@
},
{
"name": "twig/twig",
- "version": "v1.38.4",
+ "version": "v1.41.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "7732e9e7017d751313811bd118de61302e9c8b35"
+ "reference": "575cd5028362da591facde1ef5d7b94553c375c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/7732e9e7017d751313811bd118de61302e9c8b35",
- "reference": "7732e9e7017d751313811bd118de61302e9c8b35",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/575cd5028362da591facde1ef5d7b94553c375c9",
+ "reference": "575cd5028362da591facde1ef5d7b94553c375c9",
"shasum": ""
},
"require": {
@@ -2757,7 +3051,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.38-dev"
+ "dev-master": "1.41-dev"
}
},
"autoload": {
@@ -2795,7 +3089,7 @@
"keywords": [
"templating"
],
- "time": "2019-03-23T14:27:19+00:00"
+ "time": "2019-05-14T11:59:08+00:00"
},
{
"name": "typo3/phar-stream-wrapper",
@@ -2894,21 +3188,21 @@
},
{
"name": "zendframework/zend-diactoros",
- "version": "1.4.1",
+ "version": "1.8.6",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "424a840dc3bedcdeea510b42e056c77c2d6c4bef"
+ "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/424a840dc3bedcdeea510b42e056c77c2d6c4bef",
- "reference": "424a840dc3bedcdeea510b42e056c77c2d6c4bef",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
+ "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
"shasum": ""
},
"require": {
- "php": "^5.4 || ^7.0",
- "psr/http-message": "~1.0"
+ "php": "^5.6 || ^7.0",
+ "psr/http-message": "^1.0"
},
"provide": {
"psr/http-message-implementation": "1.0"
@@ -2916,17 +3210,29 @@
"require-dev": {
"ext-dom": "*",
"ext-libxml": "*",
- "phpunit/phpunit": "^4.6 || ^5.5",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
+ "zendframework/zend-coding-standard": "~1.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev",
- "dev-develop": "1.5-dev"
+ "dev-master": "1.8.x-dev",
+ "dev-develop": "1.9.x-dev",
+ "dev-release-2.0": "2.0.x-dev"
}
},
"autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php"
+ ],
"psr-4": {
"Zend\\Diactoros\\": "src/"
}
@@ -2942,34 +3248,34 @@
"psr",
"psr-7"
],
- "time": "2017-08-17T21:21:00+00:00"
+ "time": "2018-09-05T19:29:37+00:00"
},
{
"name": "zendframework/zend-escaper",
- "version": "2.5.2",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-escaper.git",
- "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+ "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
- "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+ "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
+ "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
"shasum": ""
},
"require": {
- "php": ">=5.5"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev",
- "dev-develop": "2.6-dev"
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
}
},
"autoload": {
@@ -2981,55 +3287,58 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-escaper",
+ "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
"keywords": [
+ "ZendFramework",
"escaper",
- "zf2"
+ "zf"
],
- "time": "2016-06-30T19:48:38+00:00"
+ "time": "2018-04-25T15:48:53+00:00"
},
{
"name": "zendframework/zend-feed",
- "version": "2.7.0",
+ "version": "2.12.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-feed.git",
- "reference": "12b328d382aa5200f1de53d4147033b885776b67"
+ "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/12b328d382aa5200f1de53d4147033b885776b67",
- "reference": "12b328d382aa5200f1de53d4147033b885776b67",
+ "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/d926c5af34b93a0121d5e2641af34ddb1533d733",
+ "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0",
- "zendframework/zend-escaper": "^2.5",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "php": "^5.6 || ^7.0",
+ "zendframework/zend-escaper": "^2.5.2",
+ "zendframework/zend-stdlib": "^3.2.1"
},
"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.7.5 || ^3.0.3",
- "zendframework/zend-validator": "^2.5"
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+ "psr/http-message": "^1.0.1",
+ "zendframework/zend-cache": "^2.7.2",
+ "zendframework/zend-coding-standard": "~1.0.0",
+ "zendframework/zend-db": "^2.8.2",
+ "zendframework/zend-http": "^2.7",
+ "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+ "zendframework/zend-validator": "^2.10.1"
},
"suggest": {
- "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+ "psr/http-message": "PSR-7 ^1.0.1, 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 email addresses used in Atom feeds and entries ehen using the Writer subcomponent"
+ "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev",
- "dev-develop": "2.8-dev"
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
}
},
"autoload": {
@@ -3042,40 +3351,40 @@
"BSD-3-Clause"
],
"description": "provides functionality for consuming RSS and Atom feeds",
- "homepage": "https://github.com/zendframework/zend-feed",
"keywords": [
+ "ZendFramework",
"feed",
- "zf2"
+ "zf"
],
- "time": "2016-02-11T18:54:29+00:00"
+ "time": "2019-03-05T20:08:49+00:00"
},
{
"name": "zendframework/zend-stdlib",
- "version": "3.0.1",
+ "version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "8bafa58574204bdff03c275d1d618aaa601588ae"
+ "reference": "66536006722aff9e62d1b331025089b7ec71c065"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae",
- "reference": "8bafa58574204bdff03c275d1d618aaa601588ae",
+ "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065",
+ "reference": "66536006722aff9e62d1b331025089b7ec71c065",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "athletic/athletic": "~0.1",
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0"
+ "phpbench/phpbench": "^0.13",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
}
},
"autoload": {
@@ -3087,12 +3396,13 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-stdlib",
+ "description": "SPL extensions, array utilities, error handlers, and more",
"keywords": [
+ "ZendFramework",
"stdlib",
- "zf2"
+ "zf"
],
- "time": "2016-04-12T21:19:36+00:00"
+ "time": "2018-08-28T21:34:05+00:00"
}
],
"packages-dev": [
@@ -3102,26 +3412,27 @@
"source": {
"type": "git",
"url": "https://github.com/minkphp/Mink.git",
- "reference": "9ea1cebe3dc529ba3861d87c818f045362c40484"
+ "reference": "6d637f7af4816c26ad8a943da2e3f7eef1231bea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/Mink/zipball/9ea1cebe3dc529ba3861d87c818f045362c40484",
- "reference": "9ea1cebe3dc529ba3861d87c818f045362c40484",
+ "url": "https://api.github.com/repos/minkphp/Mink/zipball/6d637f7af4816c26ad8a943da2e3f7eef1231bea",
+ "reference": "6d637f7af4816c26ad8a943da2e3f7eef1231bea",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
- "symfony/css-selector": "~2.1|~3.0"
+ "symfony/css-selector": "^2.7|^3.0|^4.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0"
+ "symfony/phpunit-bridge": "^3.3|^4.0"
},
"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)"
+ "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)",
+ "dmore/chrome-mink-driver": "fast and JS-enabled driver for any app (requires chromium or google chrome)"
},
"type": "library",
"extra": {
@@ -3152,7 +3463,7 @@
"testing",
"web"
],
- "time": "2017-02-06T09:59:54+00:00"
+ "time": "2019-05-14T09:56:49+00:00"
},
{
"name": "behat/mink-browserkit-driver",
@@ -3271,12 +3582,12 @@
"source": {
"type": "git",
"url": "https://github.com/minkphp/MinkSelenium2Driver.git",
- "reference": "93474c65a2a7bf959200ab5f7a14cc450645c185"
+ "reference": "8684ee4e634db7abda9039ea53545f86fc1e105a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/93474c65a2a7bf959200ab5f7a14cc450645c185",
- "reference": "93474c65a2a7bf959200ab5f7a14cc450645c185",
+ "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/8684ee4e634db7abda9039ea53545f86fc1e105a",
+ "reference": "8684ee4e634db7abda9039ea53545f86fc1e105a",
"shasum": ""
},
"require": {
@@ -3324,36 +3635,278 @@
"testing",
"webdriver"
],
- "time": "2018-01-07T19:17:08+00:00"
+ "time": "2018-10-10T12:39:06+00:00"
+ },
+ {
+ "name": "composer/ca-bundle",
+ "version": "1.1.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/ca-bundle.git",
+ "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+ "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "ext-pcre": "*",
+ "php": "^5.3.2 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
+ "psr/log": "^1.0",
+ "symfony/process": "^2.5 || ^3.0 || ^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\CaBundle\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+ "keywords": [
+ "cabundle",
+ "cacert",
+ "certificate",
+ "ssl",
+ "tls"
+ ],
+ "time": "2019-01-28T09:30:10+00:00"
+ },
+ {
+ "name": "composer/composer",
+ "version": "1.8.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/composer.git",
+ "reference": "949b116f9e7d98d8d276594fed74b580d125c0e6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/composer/zipball/949b116f9e7d98d8d276594fed74b580d125c0e6",
+ "reference": "949b116f9e7d98d8d276594fed74b580d125c0e6",
+ "shasum": ""
+ },
+ "require": {
+ "composer/ca-bundle": "^1.0",
+ "composer/semver": "^1.0",
+ "composer/spdx-licenses": "^1.2",
+ "composer/xdebug-handler": "^1.1",
+ "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0",
+ "seld/jsonlint": "^1.4",
+ "seld/phar-utils": "^1.0",
+ "symfony/console": "^2.7 || ^3.0 || ^4.0",
+ "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
+ "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+ "symfony/process": "^2.7 || ^3.0 || ^4.0"
+ },
+ "conflict": {
+ "symfony/console": "2.8.38"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7",
+ "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
+ },
+ "suggest": {
+ "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+ "ext-zip": "Enabling the zip extension allows you to unzip archives",
+ "ext-zlib": "Allow gzip compression of HTTP requests"
+ },
+ "bin": [
+ "bin/composer"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.8-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\": "src/Composer"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "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": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
+ "homepage": "https://getcomposer.org/",
+ "keywords": [
+ "autoload",
+ "dependency",
+ "package"
+ ],
+ "time": "2019-04-09T15:46:48+00:00"
+ },
+ {
+ "name": "composer/spdx-licenses",
+ "version": "1.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/spdx-licenses.git",
+ "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
+ "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\Spdx\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "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": "SPDX licenses list and validation library.",
+ "keywords": [
+ "license",
+ "spdx",
+ "validator"
+ ],
+ "time": "2019-03-26T10:23:26+00:00"
+ },
+ {
+ "name": "composer/xdebug-handler",
+ "version": "1.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/xdebug-handler.git",
+ "reference": "d17708133b6c276d6e42ef887a877866b909d892"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
+ "reference": "d17708133b6c276d6e42ef887a877866b909d892",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Composer\\XdebugHandler\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "John Stevenson",
+ "email": "john-stevenson@blueyonder.co.uk"
+ }
+ ],
+ "description": "Restarts a process without xdebug.",
+ "keywords": [
+ "Xdebug",
+ "performance"
+ ],
+ "time": "2019-01-28T20:25:53+00:00"
},
{
"name": "doctrine/instantiator",
- "version": "1.0.5",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+ "reference": "a2c590166b2133a4633738648b6b064edae0814a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
+ "reference": "a2c590166b2133a4633738648b6b064edae0814a",
"shasum": ""
},
"require": {
- "php": ">=5.3,<8.0-DEV"
+ "php": "^7.1"
},
"require-dev": {
- "athletic/athletic": "~0.1.8",
+ "doctrine/coding-standard": "^6.0",
"ext-pdo": "*",
"ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.0"
+ "phpbench/phpbench": "^0.13",
+ "phpstan/phpstan-phpunit": "^0.11",
+ "phpstan/phpstan-shim": "^0.11",
+ "phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -3373,20 +3926,20 @@
}
],
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://github.com/doctrine/instantiator",
+ "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
"keywords": [
"constructor",
"instantiate"
],
- "time": "2015-06-14T21:17:01+00:00"
+ "time": "2019-03-17T17:37:11+00:00"
},
{
"name": "drupal/coder",
- "version": "8.3.2",
+ "version": "8.3.3",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/coder.git",
- "reference": "44c80c21074df43572652f35bec4f184f9eae5e7"
+ "reference": "a33d3388fb2e1d94bd2aee36a8ff79186e9d8f43"
},
"require": {
"ext-mbstring": "*",
@@ -3415,7 +3968,7 @@
"phpcs",
"standards"
],
- "time": "2019-04-14T17:56:07+00:00"
+ "time": "2019-04-16T18:56:06+00:00"
},
{
"name": "fabpot/goutte",
@@ -3531,60 +4084,18 @@
],
"time": "2017-06-30T04:02:48+00:00"
},
- {
- "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-20T16:49:30+00:00"
- },
{
"name": "jcalderonzumba/gastonjs",
- "version": "v1.0.2",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/jcalderonzumba/gastonjs.git",
- "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622"
+ "reference": "575a9c18d8b87990c37252e8d9707b29f0a313f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/21bebb8ca03eb0f93ec2f3fad61192fb079e2622",
- "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622",
+ "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/575a9c18d8b87990c37252e8d9707b29f0a313f3",
+ "reference": "575a9c18d8b87990c37252e8d9707b29f0a313f3",
"shasum": ""
},
"require": {
@@ -3628,20 +4139,20 @@
"headless",
"phantomjs"
],
- "time": "2016-01-18T09:21:03+00:00"
+ "time": "2017-03-31T07:31:47+00:00"
},
{
"name": "jcalderonzumba/mink-phantomjs-driver",
- "version": "v0.3.2",
+ "version": "v0.3.3",
"source": {
"type": "git",
"url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git",
- "reference": "194942e14557b86467bf31e313f1370645d6c828"
+ "reference": "008f43670e94acd39273d15add1e7348eb23848d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/194942e14557b86467bf31e313f1370645d6c828",
- "reference": "194942e14557b86467bf31e313f1370645d6c828",
+ "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/008f43670e94acd39273d15add1e7348eb23848d",
+ "reference": "008f43670e94acd39273d15add1e7348eb23848d",
"shasum": ""
},
"require": {
@@ -3686,7 +4197,7 @@
"phantomjs",
"testing"
],
- "time": "2016-10-04T09:27:04+00:00"
+ "time": "2016-12-01T10:57:30+00:00"
},
{
"name": "justinrainbow/json-schema",
@@ -3756,16 +4267,16 @@
},
{
"name": "mikey179/vfsStream",
- "version": "v1.6.5",
+ "version": "v1.6.6",
"source": {
"type": "git",
"url": "https://github.com/bovigo/vfsStream.git",
- "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
+ "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
- "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
+ "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
+ "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
"shasum": ""
},
"require": {
@@ -3798,29 +4309,32 @@
],
"description": "Virtual file system to mock the real file system in unit tests.",
"homepage": "http://vfs.bovigo.org/",
- "time": "2017-08-01T08:02:14+00:00"
+ "time": "2019-04-08T13:54:32+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.7.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+ "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+ "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.1"
+ },
+ "replace": {
+ "myclabs/deep-copy": "self.version"
},
"require-dev": {
"doctrine/collections": "^1.0",
"doctrine/common": "^2.6",
- "phpunit/phpunit": "^4.1"
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"autoload": {
@@ -3843,7 +4357,7 @@
"object",
"object graph"
],
- "time": "2017-10-19T19:58:43+00:00"
+ "time": "2019-04-07T13:18:21+00:00"
},
{
"name": "phar-io/manifest",
@@ -3947,39 +4461,142 @@
"description": "Library for handling version information and constraints",
"time": "2017-03-05T17:38:23+00:00"
},
+ {
+ "name": "phpdocumentor/reflection-common",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": [
+ "src"
+ ]
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jaap van Otterdijk",
+ "email": "opensource@ijaap.nl"
+ }
+ ],
+ "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+ "homepage": "http://www.phpdoc.org",
+ "keywords": [
+ "FQSEN",
+ "phpDocumentor",
+ "phpdoc",
+ "reflection",
+ "static analysis"
+ ],
+ "time": "2017-09-11T18:02:19+00:00"
+ },
{
"name": "phpdocumentor/reflection-docblock",
- "version": "2.0.4",
+ "version": "4.3.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+ "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
- "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+ "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^7.0",
+ "phpdocumentor/reflection-common": "^1.0.0",
+ "phpdocumentor/type-resolver": "^0.4.0",
+ "webmozart/assert": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/instantiator": "~1.0.5",
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^6.4"
},
- "suggest": {
- "dflydev/markdown": "~1.0",
- "erusev/parsedown": "~1.0"
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": [
+ "src/"
+ ]
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Mike van Riel",
+ "email": "me@mikevanriel.com"
+ }
+ ],
+ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+ "time": "2019-04-30T17:48:53+00:00"
+ },
+ {
+ "name": "phpdocumentor/type-resolver",
+ "version": "0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpDocumentor/TypeResolver.git",
+ "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+ "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "phpdocumentor/reflection-common": "^1.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^0.9.4",
+ "phpunit/phpunit": "^5.2||^4.8.24"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
- "psr-0": {
- "phpDocumentor": [
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": [
"src/"
]
}
@@ -3991,40 +4608,40 @@
"authors": [
{
"name": "Mike van Riel",
- "email": "mike.vanriel@naenius.com"
+ "email": "me@mikevanriel.com"
}
],
- "time": "2015-02-03T12:10:50+00:00"
+ "time": "2017-07-14T14:27:02+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "v1.7.0",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
- "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
- "sebastian/comparator": "^1.1|^2.0",
+ "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+ "sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8 || ^5.6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -4057,7 +4674,7 @@
"spy",
"stub"
],
- "time": "2017-03-02T20:05:34+00:00"
+ "time": "2018-08-05T17:53:17+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -5011,6 +5628,99 @@
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00"
},
+ {
+ "name": "seld/jsonlint",
+ "version": "1.7.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/jsonlint.git",
+ "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+ },
+ "bin": [
+ "bin/jsonlint"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "JSON Linter",
+ "keywords": [
+ "json",
+ "linter",
+ "parser",
+ "validator"
+ ],
+ "time": "2018-01-24T12:46:19+00:00"
+ },
+ {
+ "name": "seld/phar-utils",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/phar-utils.git",
+ "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
+ "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Seld\\PharUtils\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be"
+ }
+ ],
+ "description": "PHAR file format utilities, for when PHP phars you up",
+ "keywords": [
+ "phra"
+ ],
+ "time": "2015-10-13T18:44:15+00:00"
+ },
{
"name": "squizlabs/php_codesniffer",
"version": "3.4.2",
@@ -5064,25 +5774,25 @@
},
{
"name": "symfony/browser-kit",
- "version": "v3.4.26",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "7f2b0843d5045468225f9a9b27a0cb171ae81828"
+ "reference": "c09c18cca96d7067152f78956faf55346c338283"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/7f2b0843d5045468225f9a9b27a0cb171ae81828",
- "reference": "7f2b0843d5045468225f9a9b27a0cb171ae81828",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c09c18cca96d7067152f78956faf55346c338283",
+ "reference": "c09c18cca96d7067152f78956faf55346c338283",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8",
- "symfony/dom-crawler": "~2.8|~3.0|~4.0"
+ "php": "^7.1.3",
+ "symfony/dom-crawler": "~3.4|~4.0"
},
"require-dev": {
- "symfony/css-selector": "~2.8|~3.0|~4.0",
- "symfony/process": "~2.8|~3.0|~4.0"
+ "symfony/css-selector": "~3.4|~4.0",
+ "symfony/process": "~3.4|~4.0"
},
"suggest": {
"symfony/process": ""
@@ -5090,7 +5800,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.4-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -5117,11 +5827,11 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2019-04-06T19:33:58+00:00"
+ "time": "2019-04-07T09:56:43+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -5174,25 +5884,25 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v3.4.26",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "d40023c057393fb25f7ca80af2a56ed948c45a09"
+ "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d40023c057393fb25f7ca80af2a56ed948c45a09",
- "reference": "d40023c057393fb25f7ca80af2a56ed948c45a09",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
+ "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8",
+ "php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
- "symfony/css-selector": "~2.8|~3.0|~4.0"
+ "symfony/css-selector": "~3.4|~4.0"
},
"suggest": {
"symfony/css-selector": ""
@@ -5200,7 +5910,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.4-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -5227,11 +5937,110 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2019-02-23T15:06:07+00:00"
+ "time": "2019-02-23T15:17:42+00:00"
+ },
+ {
+ "name": "symfony/filesystem",
+ "version": "v4.2.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/filesystem.git",
+ "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
+ "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3",
+ "symfony/polyfill-ctype": "~1.8"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.2-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Filesystem\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Filesystem Component",
+ "homepage": "https://symfony.com",
+ "time": "2019-02-07T11:40:08+00:00"
+ },
+ {
+ "name": "symfony/finder",
+ "version": "v4.2.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/finder.git",
+ "reference": "e45135658bd6c14b61850bf131c4f09a55133f69"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/e45135658bd6c14b61850bf131c4f09a55133f69",
+ "reference": "e45135658bd6c14b61850bf131c4f09a55133f69",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.2-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Finder\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Finder Component",
+ "homepage": "https://symfony.com",
+ "time": "2019-04-06T13:51:08+00:00"
},
{
"name": "symfony/phpunit-bridge",
- "version": "v3.4.26",
+ "version": "v3.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
@@ -5333,13 +6142,65 @@
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"time": "2019-04-04T09:56:43+00:00"
+ },
+ {
+ "name": "webmozart/assert",
+ "version": "1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/webmozart/assert.git",
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.3 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6",
+ "sebastian/version": "^1.0.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Webmozart\\Assert\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }
+ ],
+ "description": "Assertions to validate method input/output with nice error messages.",
+ "keywords": [
+ "assert",
+ "check",
+ "validate"
+ ],
+ "time": "2018-12-25T11:19:39+00:00"
}
],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
"behat/mink": 20,
- "behat/mink-selenium2-driver": 20
+ "behat/mink-selenium2-driver": 20,
+ "composer/composer": 0
},
"prefer-stable": true,
"prefer-lowest": false,
@@ -5357,7 +6218,8 @@
"ext-spl": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
- "php": "^5.5.9|>=7.0.8"
+ "php": ">=7.0.8",
+ "composer-plugin-api": "^1.0.0"
},
"platform-dev": []
}
diff --git a/core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php b/core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php
index 71ad1fe26b..332dc12093 100644
--- a/core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php
+++ b/core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php
@@ -33,7 +33,7 @@ public static function generateAutoload($package_name, $web_root, $vendorPath) {
$fs = new SymfonyFilesystem();
$relativeVendorPath = $fs->makePathRelative($vendorPath, realpath($location));
$fs->dumpFile($autoloadPath->fullPath(), static::autoLoadContents($relativeVendorPath));
- return (new ScaffoldResult($autoloadPath))->setManaged();
+ return new ScaffoldResult($autoloadPath, TRUE);
}
/**
diff --git a/core/lib/Drupal/Component/Scaffold/Handler.php b/core/lib/Drupal/Component/Scaffold/Handler.php
index a4b02f7b78..a6c14dca22 100644
--- a/core/lib/Drupal/Component/Scaffold/Handler.php
+++ b/core/lib/Drupal/Component/Scaffold/Handler.php
@@ -136,8 +136,8 @@ public function onPostPackageEvent(PackageEvent $event) {
protected function createScaffoldOperations(PackageInterface $package, array $package_file_mappings) {
$scaffoldOpFactory = new OperationFactory($this->composer);
$scaffoldOps = [];
- foreach ($package_file_mappings as $key => $metadata) {
- $scaffoldOps[$key] = $scaffoldOpFactory->create($package, $key, $metadata);
+ foreach ($package_file_mappings as $dest_rel_path => $metadata) {
+ $scaffoldOps[$dest_rel_path] = $scaffoldOpFactory->create($package, $dest_rel_path, $metadata);
}
return $scaffoldOps;
}
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php b/core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php
index 3e7b50044c..2f656d03da 100644
--- a/core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php
+++ b/core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php
@@ -10,8 +10,7 @@
/**
* Scaffold operation to add to the beginning and/or end of a scaffold file.
*/
-class AppendOp implements OperationInterface, OriginalOpAwareInterface {
- use OriginalOpAwareTrait;
+class AppendOp implements OperationInterface, PreprocessOriginalOpInterface {
/**
* Path to the source file to prepend, if any.
@@ -31,26 +30,13 @@ class AppendOp implements OperationInterface, OriginalOpAwareInterface {
* Sets the relative path to the prepend file.
*
* @param \Drupal\Component\Scaffold\ScaffoldFilePath $prependPath
- * The relative path to the prepend file file.
- *
- * @return $this
- */
- public function setPrependFile(ScaffoldFilePath $prependPath) {
- $this->prepend = $prependPath;
- return $this;
- }
-
- /**
- * Sets the relative path to the append file.
- *
+ * The relative path to the prepend file.
* @param \Drupal\Component\Scaffold\ScaffoldFilePath $appendPath
- * The relative path to the append file file.
- *
- * @return $this
+ * The relative path to the append file.
*/
- public function setAppendFile(ScaffoldFilePath $appendPath) {
+ public function __construct(ScaffoldFilePath $prependPath = NULL, ScaffoldFilePath $appendPath = NULL) {
+ $this->prepend = $prependPath;
$this->append = $appendPath;
- return $this;
}
/**
@@ -69,23 +55,27 @@ protected function addInterpolationData(Interpolator $interpolator) {
}
/**
- * Appends or prepends information to the overridden scaffold file.
+ * Called if the append op does not have an original operation at the same destination path.
*
* {@inheritdoc}
*/
public function process(ScaffoldFilePath $destination, IOInterface $io, ScaffoldOptions $options) {
+ throw new \RuntimeException($destination->getInterpolator()->interpolate("Cannot append/prepend because no prior package provided a scaffold file at that [dest-rel-path]."));
+ }
+
+ /**
+ * Appends or prepends information to the overridden scaffold file.
+ *
+ * {@inheritdoc}
+ */
+ public function preprocess(OperationInterface $originalOp, ScaffoldFilePath $destination, IOInterface $io, ScaffoldOptions $options) {
$interpolator = $destination->getInterpolator();
$this->addInterpolationData($interpolator);
$destination_path = $destination->fullPath();
- // It is not possible to append / prepend unless the destination path
- // is the same as some scaffold file provided by an earlier package.
- if (!$this->hasOriginalOp()) {
- throw new \RuntimeException($interpolator->interpolate("Cannot append/prepend because no prior package provided a scaffold file at that [dest-rel-path]."));
- }
// First, scaffold the original file. Disable symlinking, because we
// need a copy of the file if we're going to append / prepend to it.
@unlink($destination_path);
- $this->originalOp()->process($destination, $io, $options->overrideSymlink(FALSE));
+ $originalOp->process($destination, $io, $options->overrideSymlink(FALSE));
// Fetch the prepend contents, if provided.
$prependContents = '';
if (!empty($this->prepend)) {
@@ -99,7 +89,7 @@ public function process(ScaffoldFilePath $destination, IOInterface $io, Scaffold
$io->write($interpolator->interpolate(" - Append to [dest-rel-path] from [append-rel-path]"));
}
$this->append($destination, $prependContents, $appendContents, $io);
- return (new ScaffoldResult($destination))->setManaged();
+ return new ScaffoldResult($destination, TRUE);
}
/**
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/OperationCollection.php b/core/lib/Drupal/Component/Scaffold/Operations/OperationCollection.php
index 76cdea3dca..d76757cedc 100644
--- a/core/lib/Drupal/Component/Scaffold/Operations/OperationCollection.php
+++ b/core/lib/Drupal/Component/Scaffold/Operations/OperationCollection.php
@@ -107,11 +107,12 @@ public function collateScaffoldFiles(array $file_mappings, Interpolator $locatio
foreach ($file_mappings as $package_name => $package_file_mappings) {
foreach ($package_file_mappings as $destination_rel_path => $op) {
$destination = ScaffoldFilePath::destinationPath($package_name, $destination_rel_path, $locationReplacements);
- $scaffold_file = (new ScaffoldFileInfo())->setDestination($destination)->setOp($op);
+ $scaffold_file = new ScaffoldFileInfo($destination, $op);
// If there was already a scaffolding operation happening at this
// path, then pass it along to the new scaffold op, if it cares.
- if (isset($list_of_scaffold_files[$destination_rel_path]) && $op instanceof OriginalOpAwareInterface) {
- $op->setOriginalOp($list_of_scaffold_files[$destination_rel_path]->op());
+ if (isset($list_of_scaffold_files[$destination_rel_path]) && $op instanceof PreprocessOriginalOpInterface) {
+ $preprocessOp = new PreprocessOp($list_of_scaffold_files[$destination_rel_path]->op(), $op);
+ $scaffold_file = new ScaffoldFileInfo($destination, $preprocessOp);
}
$list_of_scaffold_files[$destination_rel_path] = $scaffold_file;
$resolved_file_mappings[$package_name][$destination_rel_path] = $scaffold_file;
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php b/core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php
index dcbff7cf46..34846b9811 100644
--- a/core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php
+++ b/core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php
@@ -77,7 +77,6 @@ public function create(PackageInterface $package, $dest_rel_path, $metadata) {
* A scaffold replace operation object.
*/
protected function createReplaceOp(PackageInterface $package, $dest_rel_path, array $metadata) {
- $op = new ReplaceOp();
// If this op does not provide an 'overwrite' value, default it to true.
$metadata += ['overwrite' => TRUE];
if (!isset($metadata['path'])) {
@@ -86,7 +85,7 @@ protected function createReplaceOp(PackageInterface $package, $dest_rel_path, ar
$package_name = $package->getName();
$package_path = $this->getPackagePath($package);
$source = ScaffoldFilePath::sourcePath($package_name, $package_path, $dest_rel_path, $metadata['path']);
- $op->setSource($source)->setOverwrite($metadata['overwrite']);
+ $op = new ReplaceOp($source, $metadata['overwrite']);
return $op;
}
@@ -104,17 +103,17 @@ protected function createReplaceOp(PackageInterface $package, $dest_rel_path, ar
* A scaffold replace operation object.
*/
protected function createAppendOp(PackageInterface $package, $dest_rel_path, array $metadata) {
- $op = new AppendOp();
$package_name = $package->getName();
$package_path = $this->getPackagePath($package);
+ $prepend_source_file = null;
+ $append_source_file = null;
if (isset($metadata['prepend'])) {
$prepend_source_file = ScaffoldFilePath::sourcePath($package_name, $package_path, $dest_rel_path, $metadata['prepend']);
- $op->setPrependFile($prepend_source_file);
}
if (isset($metadata['append'])) {
$append_source_file = ScaffoldFilePath::sourcePath($package_name, $package_path, $dest_rel_path, $metadata['append']);
- $op->setAppendFile($append_source_file);
}
+ $op = new AppendOp($prepend_source_file, $append_source_file);
return $op;
}
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/OriginalOpAwareInterface.php b/core/lib/Drupal/Component/Scaffold/Operations/OriginalOpAwareInterface.php
deleted file mode 100644
index 6e5d0710ff..0000000000
--- a/core/lib/Drupal/Component/Scaffold/Operations/OriginalOpAwareInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-originalOp = $originalOp;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function hasOriginalOp() {
- return isset($this->originalOp);
- }
-
- /**
- * {@inheritdoc}
- */
- public function originalOp() {
- return $this->originalOp;
- }
-
-}
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/PreprocessOp.php b/core/lib/Drupal/Component/Scaffold/Operations/PreprocessOp.php
new file mode 100644
index 0000000000..24ec8eebca
--- /dev/null
+++ b/core/lib/Drupal/Component/Scaffold/Operations/PreprocessOp.php
@@ -0,0 +1,31 @@
+originalOp = $originalOp;
+ $this->op = $op;
+ }
+
+ /**
+ * Skip the specified scaffold file.
+ *
+ * {@inheritdoc}
+ */
+ public function process(ScaffoldFilePath $destination, IOInterface $io, ScaffoldOptions $options) {
+ return $this->op->preprocess($this->originalOp, $destination, $io, $options);
+ }
+
+}
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/PreprocessOriginalOpInterface.php b/core/lib/Drupal/Component/Scaffold/Operations/PreprocessOriginalOpInterface.php
new file mode 100644
index 0000000000..e287fc21e2
--- /dev/null
+++ b/core/lib/Drupal/Component/Scaffold/Operations/PreprocessOriginalOpInterface.php
@@ -0,0 +1,31 @@
+source = $sourcePath;
- return $this;
+ $this->overwrite = $overwrite;
}
/**
@@ -49,19 +52,6 @@ protected function getSource() {
return $this->source;
}
- /**
- * Sets whether the scaffold file should overwrite existing files.
- *
- * @param bool $overwrite
- * Whether to overwrite existing files.
- *
- * @return $this
- */
- public function setOverwrite($overwrite) {
- $this->overwrite = $overwrite;
- return $this;
- }
-
/**
* Determines whether scaffold file should overwrite files.
*
@@ -85,7 +75,7 @@ public function process(ScaffoldFilePath $destination, IOInterface $io, Scaffold
if ($this->getOverwrite() === FALSE && file_exists($destination_path)) {
$interpolator = $destination->getInterpolator();
$io->write($interpolator->interpolate(" - Skip [dest-rel-path] because it already exists and overwrite is false."));
- return (new ScaffoldResult($destination))->setManaged(FALSE);
+ return new ScaffoldResult($destination, FALSE);
}
// Get rid of the destination if it exists, and make sure that
@@ -117,7 +107,7 @@ protected function copyScaffold(ScaffoldFilePath $destination, IOInterface $io)
throw new \RuntimeException($interpolator->interpolate("Could not copy source file [src-rel-path] to [dest-rel-path]!"));
}
$io->write($interpolator->interpolate(" - Copy [dest-rel-path] from [src-rel-path]"));
- return (new ScaffoldResult($destination))->setManaged($this->getOverwrite());
+ return new ScaffoldResult($destination, $this->getOverwrite());
}
/**
@@ -141,7 +131,7 @@ protected function symlinkScaffold(ScaffoldFilePath $destination, IOInterface $i
throw new \RuntimeException($interpolator->interpolate("Could not symlink source file [src-rel-path] to [dest-rel-path]!"), [], $e);
}
$io->write($interpolator->interpolate(" - Link [dest-rel-path] from [src-rel-path]"));
- return (new ScaffoldResult($destination))->setManaged($this->getOverwrite());
+ return new ScaffoldResult($destination, $this->getOverwrite());
}
}
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php b/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php
index 37dcc5adde..b542b1e1a3 100644
--- a/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php
+++ b/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php
@@ -28,10 +28,12 @@ class ScaffoldResult {
*
* @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination
* The path to the scaffold file that was processed.
+ * @param bool $isManaged
+ * (optional) Whether this result is managed. Defaults to FALSE.
*/
- public function __construct(ScaffoldFilePath $destination) {
+ public function __construct(ScaffoldFilePath $destination, $isManaged = FALSE) {
$this->destination = $destination;
- $this->managed = FALSE;
+ $this->managed = $isManaged;
}
/**
@@ -44,19 +46,6 @@ public function isManaged() {
return $this->managed;
}
- /**
- * Records whether this result was managed or unmanaged.
- *
- * @param bool $isManaged
- * (optional) Whether this result is managed. Defaults to TRUE.
- *
- * @return $this
- */
- public function setManaged($isManaged = TRUE) {
- $this->managed = $isManaged;
- return $this;
- }
-
/**
* Gets the destination scaffold file that this result refers to.
*
diff --git a/core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php b/core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php
index d61b26c3a2..325737be0f 100644
--- a/core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php
+++ b/core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php
@@ -19,7 +19,7 @@ class SkipOp implements OperationInterface {
public function process(ScaffoldFilePath $destination, IOInterface $io, ScaffoldOptions $options) {
$interpolator = $destination->getInterpolator();
$io->write($interpolator->interpolate(" - Skip [dest-rel-path]: disabled"));
- return (new ScaffoldResult($destination))->setManaged(FALSE);
+ return new ScaffoldResult($destination, FALSE);
}
}
diff --git a/core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php b/core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php
index b9f3eea8d0..c17fe3096d 100644
--- a/core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php
+++ b/core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php
@@ -30,16 +30,17 @@ class ScaffoldFileInfo {
protected $op;
/**
- * Sets the Scaffold operation.
+ * Constructs a ScaffoldFileInfo object.
*
+ * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination
+ * The full and relative paths to the destination file and the package
+ * defining it.
* @param \Drupal\Component\Scaffold\Operations\OperationInterface $op
* Operations object that will handle scaffolding operations.
- *
- * @return $this
*/
- public function setOp(OperationInterface $op) {
+ public function __construct(ScaffoldFilePath $destination, OperationInterface $op) {
+ $this->destination = $destination;
$this->op = $op;
- return $this;
}
/**
@@ -62,20 +63,6 @@ public function packageName() {
return $this->destination->packageName();
}
- /**
- * Sets the relative path to the destination.
- *
- * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination
- * The full and relative paths to the destination file and the package
- * defining it.
- *
- * @return $this
- */
- public function setDestination(ScaffoldFilePath $destination) {
- $this->destination = $destination;
- return $this;
- }
-
/**
* Gets the destination.
*
diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php b/core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php
index 802d9a3aeb..86dab883e1 100644
--- a/core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php
+++ b/core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php
@@ -159,7 +159,7 @@ public function getLocationReplacements() {
*/
public function replaceOp($project_name, $source) {
$source_path = $this->sourcePath($project_name, $source);
- return (new ReplaceOp())->setSource($source_path);
+ return new ReplaceOp($source_path, TRUE);
}
/**
@@ -175,7 +175,7 @@ public function replaceOp($project_name, $source) {
*/
public function appendOp($project_name, $source) {
$source_path = $this->sourcePath($project_name, $source);
- return (new AppendOp())->setAppendFile($source_path);
+ return new AppendOp(NULL, $source_path);
}
/**
diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php b/core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php
index 339daa0ae1..a1119a262e 100644
--- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php
+++ b/core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php
@@ -23,19 +23,14 @@ public function testProcess() {
$destination = $fixtures->destinationPath('[web-root]/robots.txt');
$source = $fixtures->sourcePath('drupal-assets-fixture', 'robots.txt');
$options = ScaffoldOptions::defaultOptions();
- $originalOp = new ReplaceOp();
- $originalOp->setSource($source);
- $originalOp->setOverwrite(TRUE);
+ $originalOp = new ReplaceOp($source, TRUE);
$prepend = $fixtures->sourcePath('drupal-drupal-test-append', 'prepend-to-robots.txt');
$append = $fixtures->sourcePath('drupal-drupal-test-append', 'append-to-robots.txt');
- $sut = new AppendOp();
- $sut->setOriginalOp($originalOp);
- $sut->setPrependFile($prepend);
- $sut->setAppendFile($append);
+ $sut = new AppendOp($prepend, $append);
// Assert that there is no target file before we run our test.
$this->assertFileNotExists($destination->fullPath());
// Test the system under test.
- $sut->process($destination, $fixtures->io(), $options);
+ $sut->preprocess($originalOp, $destination, $fixtures->io(), $options);
// Assert that the target file was created.
$this->assertFileExists($destination->fullPath());
// Assert the target contained the contents from the correct scaffold files.
diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/OperationCollectionTest.php b/core/tests/Drupal/Tests/Component/Scaffold/Integration/OperationCollectionTest.php
index 54863e3894..6bd8d8ab87 100644
--- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/OperationCollectionTest.php
+++ b/core/tests/Drupal/Tests/Component/Scaffold/Integration/OperationCollectionTest.php
@@ -5,6 +5,8 @@
use PHPUnit\Framework\TestCase;
use Drupal\Component\Scaffold\ScaffoldFileInfo;
use Drupal\Tests\Component\Scaffold\Fixtures;
+use Drupal\Component\Scaffold\Operations\AppendOp;
+use Drupal\Component\Scaffold\Operations\PreprocessOp;
use Drupal\Component\Scaffold\Operations\SkipOp;
use Drupal\Component\Scaffold\Operations\OperationCollection;
@@ -62,8 +64,15 @@ protected function assertResolvedToSameOp($project, $dest, $file_mappings, $scaf
$resolved_file_info = $resolved_file_mappings[$project][$dest];
$this->assertEquals(get_class($resolved_file_info), ScaffoldFileInfo::class);
$resolved_scaffold_op = $resolved_file_info->op();
- $this->assertEquals(get_class($file_mappings[$project][$dest]), get_class($resolved_scaffold_op));
- $this->assertEquals($file_mappings[$project][$dest], $resolved_scaffold_op);
+ // If this is an append op then it will be overridden by a preprocess op
+ $expected = get_class($file_mappings[$project][$dest]);
+ if ($expected == AppendOp::class) {
+ $this->assertEquals(PreprocessOp::class, get_class($resolved_scaffold_op));
+ }
+ else {
+ $this->assertEquals($expected, get_class($resolved_scaffold_op));
+ $this->assertEquals($file_mappings[$project][$dest], $resolved_scaffold_op);
+ }
$this->assertEquals($project, $scaffold_list[$dest]->packageName());
}
diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php b/core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php
index 492b67ef20..ec568fc8da 100644
--- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php
+++ b/core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php
@@ -22,9 +22,7 @@ public function testProcess() {
$destination = $fixtures->destinationPath('[web-root]/robots.txt');
$source = $fixtures->sourcePath('drupal-assets-fixture', 'robots.txt');
$options = ScaffoldOptions::defaultOptions();
- $sut = new ReplaceOp();
- $sut->setSource($source);
- $sut->setOverwrite(TRUE);
+ $sut = new ReplaceOp($source, TRUE);
// Assert that there is no target file before we run our test.
$this->assertFileNotExists($destination->fullPath());
// Test the system under test.