From 8c7dac74c90d640cdc8564963b2736db95a33308 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 28 Mar 2021 16:19:58 -0400 Subject: [PATCH] Task/update labrador core (#22) * Update to work with php 8.0 and 3.2a core * move to GH actions * fix code lint * remove final from http application --- .github/workflows/php.yml | 37 + .gitignore | 1 + .scrutinizer.yml | 33 - .travis.yml | 16 - composer.json | 23 +- composer.lock | 1717 ++++++++++++++++++--------- phpunit.xml | 22 + phpunit.xml.dist | 38 - src/DefaultHttpApplication.php | 99 ++ src/DependencyGraph.php | 62 - src/HttpApplication.php | 141 +-- src/Router/FastRouteRouter.php | 2 +- src/Router/FriendlyRouter.php | 2 +- test/DependencyGraphTest.php | 68 -- test/HttpApplicationTest.php | 92 +- test/Router/FastRouteRouterTest.php | 4 +- test/Router/FriendlyRouterTest.php | 85 +- 17 files changed, 1436 insertions(+), 1006 deletions(-) create mode 100644 .github/workflows/php.yml delete mode 100644 .scrutinizer.yml delete mode 100644 .travis.yml create mode 100644 phpunit.xml delete mode 100644 phpunit.xml.dist create mode 100644 src/DefaultHttpApplication.php delete mode 100644 src/DependencyGraph.php delete mode 100644 test/DependencyGraphTest.php diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml new file mode 100644 index 0000000..a58e274 --- /dev/null +++ b/.github/workflows/php.yml @@ -0,0 +1,37 @@ +name: 'Unit Testing & Code Lint' + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build-test: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Composer 7 + uses: php-actions/composer@v5 + with: + php_version: 7 + - name: PHP 7 tests + uses: php-actions/phpunit@v2 + with: + version: 8 + php_version: 7 + + - name: Composer 8 + uses: php-actions/composer@v5 + with: + php_version: 8 + - name: PHP 8 tests + uses: php-actions/phpunit@v2 + with: + version: 8 + php_version: 8 + + - name: Run code sniffer + run: composer run code-lint \ No newline at end of file diff --git a/.gitignore b/.gitignore index ecd01d8..9d5a94e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .idea build/ vendor/ +.phpunit.result.cache \ No newline at end of file diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 34ff711..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,33 +0,0 @@ -before_commands: - - "composer self-update" - - "composer update" - -filter: - excluded_paths: ["vendor/*"] - -tools: - php_code_coverage: - enabled: true - test_command: phpunit --configuration travis-phpunit.xml.dist - filter: - paths: ["src/*"] - excluded_paths: ["tests/*", "vendor/*"] - php_cpd: - enabled: true - excluded_dirs: ["vendor"] - php_loc: - enabled: true - command: phploc - names: - - '*.php' - excluded_dirs: ["vendor"] - php_mess_detector: true - php_pdepend: - enabled: true - excluded_dirs: ["vendor"] - php_analyzer: - enabled: true - filter: - paths: ["src/", "tests/"] - sensiolabs_security_checker: true - external_code_coverage: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b17a35d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -language: php -branches: - only: - - master -php: - - 7.2 - -before_script: - - composer self-update - - composer install --no-progress --no-suggest --dev -script: - - vendor/bin/labrador-cs src/ test/ - - vendor/bin/phpunit --coverage-clover=coverage.clover - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover coverage.clover diff --git a/composer.json b/composer.json index 99054bf..7b0278f 100644 --- a/composer.json +++ b/composer.json @@ -1,20 +1,23 @@ { "name": "cspray/labrador-http", + "description": "A HTTP microframework written on top of Amp and Labrador", + "scripts": { + "code-lint": "vendor/bin/labrador-cs src/ test/", + "test": "vendor/bin/phpunit", + "test-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html ./build/coverage" + }, "require": { - "php": "~7.2", + "php": "^7.2|^8.0", "ext-json": "*", "amphp/http-server": "~2.1", - "amphp/file": "^1.0", - "cspray/labrador": "dev-main", - "cspray/labrador-async-event": "~2.2.0", - "nikic/fast-route": "~1.3", - "monolog/monolog": "^2.0" + "cspray/labrador": "~3.2.0-alpha", + "nikic/fast-route": "~1.3" }, "require-dev": { - "phpunit/phpunit": "~7", - "amphp/http-client": "^4.0.0-rc7", - "amphp/phpunit-util": "^1.2", - "cspray/labrador-coding-standard": "0.1.0" + "phpunit/phpunit": "^9.3", + "amphp/http-client": "^4.5", + "cspray/labrador-coding-standard": "0.1.0", + "amphp/phpunit-util": "^1.4" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 466ec18..03095ec 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,73 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "934611b851c8c34da3e33b7abe296842", + "content-hash": "6eebaf579fe9f5252df39315ddd92455", "packages": [ + { + "name": "adbario/php-dot-notation", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/adbario/php-dot-notation.git", + "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/eee4fc81296531e6aafba4c2bbccfc5adab1676e", + "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0|^6.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Adbar\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Riku Särkinen", + "email": "riku@adbar.io" + } + ], + "description": "PHP dot notation access to arrays", + "homepage": "https://github.com/adbario/php-dot-notation", + "keywords": [ + "ArrayAccess", + "dotnotation" + ], + "support": { + "issues": "https://github.com/adbario/php-dot-notation/issues", + "source": "https://github.com/adbario/php-dot-notation/tree/2.x" + }, + "time": "2019-01-01T23:59:15+00:00" + }, { "name": "amphp/amp", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc" + "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/f220a51458bf4dd0dedebb171ac3457813c72bbc", - "reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc", + "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9", + "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9", "shasum": "" }, "require": { @@ -82,38 +135,44 @@ "non-blocking", "promise" ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.5.2" + }, "funding": [ { "url": "https://github.com/amphp", "type": "github" } ], - "time": "2020-07-14T21:47:18+00:00" + "time": "2021-01-10T17:06:37+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.7.3", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592" + "reference": "f0c20cf598a958ba2aa8c6e5a71c697d652c7088" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/b867505edb79dda8f253ca3c3a2bbadae4b16592", - "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/f0c20cf598a958ba2aa8c6e5a71c697d652c7088", + "reference": "f0c20cf598a958ba2aa8c6e5a71c697d652c7088", "shasum": "" }, "require": { - "amphp/amp": "^2" + "amphp/amp": "^2", + "php": ">=7.1" }, "require-dev": { "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1", + "amphp/phpunit-util": "^1.4", "friendsofphp/php-cs-fixer": "^2.3", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^6 || ^7 || ^8", - "vimeo/psalm": "^3.9@dev" + "psalm/phar": "^3.11.4" }, "type": "library", "extra": { @@ -153,7 +212,12 @@ "non-blocking", "stream" ], - "time": "2020-04-04T16:56:54+00:00" + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/master" + }, + "time": "2020-06-29T18:35:05+00:00" }, { "name": "amphp/cache", @@ -207,20 +271,25 @@ ], "description": "A promise-aware caching API for Amp.", "homepage": "https://github.com/amphp/cache", + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/cache/issues", + "source": "https://github.com/amphp/cache/tree/v1.4.0" + }, "time": "2020-04-19T16:10:08+00:00" }, { "name": "amphp/dns", - "version": "v1.2.2", + "version": "v1.2.3", "source": { "type": "git", "url": "https://github.com/amphp/dns.git", - "reference": "8cf2ccc4fa5a97f15b0b11087b22d2b544e45ab2" + "reference": "852292532294d7972c729a96b49756d781f7c59d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/dns/zipball/8cf2ccc4fa5a97f15b0b11087b22d2b544e45ab2", - "reference": "8cf2ccc4fa5a97f15b0b11087b22d2b544e45ab2", + "url": "https://api.github.com/repos/amphp/dns/zipball/852292532294d7972c729a96b49756d781f7c59d", + "reference": "852292532294d7972c729a96b49756d781f7c59d", "shasum": "" }, "require": { @@ -284,87 +353,17 @@ "dns", "resolve" ], - "time": "2020-06-19T20:28:16+00:00" - }, - { - "name": "amphp/file", - "version": "v1.0.2", - "source": { - "type": "git", - "url": "https://github.com/amphp/file.git", - "reference": "54dcef2a3e38f445ae78ea44ff12c95738e46420" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/amphp/file/zipball/54dcef2a3e38f445ae78ea44ff12c95738e46420", - "reference": "54dcef2a3e38f445ae78ea44ff12c95738e46420", - "shasum": "" - }, - "require": { - "amphp/amp": "^2.2", - "amphp/byte-stream": "^1.6.1", - "amphp/parallel": "^1.2", - "php": ">=7.1" - }, - "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1.1", - "ext-eio": "^2", - "ext-uv": "^0.3 || ^0.2", - "phpunit/phpunit": "^8 || ^7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Amp\\File\\": "src" - }, - "files": [ - "src/functions.php" - ] + "support": { + "issues": "https://github.com/amphp/dns/issues", + "source": "https://github.com/amphp/dns/tree/v1.2.3" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniel Lowrey", - "email": "rdlowrey@php.net" - }, - { - "name": "Aaron Piotrowski", - "email": "aaron@trowski.com" - }, - { - "name": "Niklas Keller", - "email": "me@kelunik.com" - } - ], - "description": "Allows non-blocking access to the filesystem for Amp.", - "homepage": "https://github.com/amphp/file", - "keywords": [ - "amp", - "amphp", - "async", - "disk", - "file", - "filesystem", - "io", - "non-blocking", - "static" - ], "funding": [ { "url": "https://github.com/amphp", "type": "github" } ], - "time": "2020-07-14T15:15:32+00:00" + "time": "2020-07-21T19:04:57+00:00" }, { "name": "amphp/hpack", @@ -422,20 +421,24 @@ "hpack", "http-2" ], + "support": { + "issues": "https://github.com/amphp/hpack/issues", + "source": "https://github.com/amphp/hpack/tree/v3.1.0" + }, "time": "2020-01-11T19:33:14+00:00" }, { "name": "amphp/http", - "version": "v1.6.0", + "version": "v1.6.3", "source": { "type": "git", "url": "https://github.com/amphp/http.git", - "reference": "8a1a1d6a78e6f432618aea02c6351602cf735cef" + "reference": "e2b75561011a9596e4574cc867e07a706d56394b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/http/zipball/8a1a1d6a78e6f432618aea02c6351602cf735cef", - "reference": "8a1a1d6a78e6f432618aea02c6351602cf735cef", + "url": "https://api.github.com/repos/amphp/http/zipball/e2b75561011a9596e4574cc867e07a706d56394b", + "reference": "e2b75561011a9596e4574cc867e07a706d56394b", "shasum": "" }, "require": { @@ -471,7 +474,17 @@ } ], "description": "Basic HTTP primitives which can be shared by servers and clients.", - "time": "2020-01-14T17:41:56+00:00" + "support": { + "issues": "https://github.com/amphp/http/issues", + "source": "https://github.com/amphp/http/tree/v1.6.3" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2020-11-28T17:04:34+00:00" }, { "name": "amphp/http-server", @@ -558,6 +571,10 @@ "non-blocking", "server" ], + "support": { + "issues": "https://github.com/amphp/http-server/issues", + "source": "https://github.com/amphp/http-server/tree/master" + }, "time": "2020-06-20T14:40:33+00:00" }, { @@ -619,71 +636,11 @@ "logging", "non-blocking" ], - "time": "2019-09-04T15:31:40+00:00" - }, - { - "name": "amphp/parallel", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/amphp/parallel.git", - "reference": "2c1039bf7ca137eae4d954b14c09a7535d7d4e1c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/amphp/parallel/zipball/2c1039bf7ca137eae4d954b14c09a7535d7d4e1c", - "reference": "2c1039bf7ca137eae4d954b14c09a7535d7d4e1c", - "shasum": "" - }, - "require": { - "amphp/amp": "^2", - "amphp/byte-stream": "^1.6.1", - "amphp/parser": "^1", - "amphp/process": "^1", - "amphp/serialization": "^1", - "amphp/sync": "^1.0.1", - "php": ">=7.1" - }, - "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1.1", - "phpunit/phpunit": "^8 || ^7" - }, - "type": "library", - "autoload": { - "psr-4": { - "Amp\\Parallel\\": "lib" - }, - "files": [ - "lib/Context/functions.php", - "lib/Sync/functions.php", - "lib/Worker/functions.php" - ] + "support": { + "issues": "https://github.com/amphp/log/issues", + "source": "https://github.com/amphp/log/tree/master" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Aaron Piotrowski", - "email": "aaron@trowski.com" - }, - { - "name": "Stephen Coakley", - "email": "me@stephencoakley.com" - } - ], - "description": "Parallel processing component for Amp.", - "homepage": "https://github.com/amphp/parallel", - "keywords": [ - "async", - "asynchronous", - "concurrent", - "multi-processing", - "multi-threading" - ], - "time": "2020-04-27T15:12:37+00:00" + "time": "2019-09-04T15:31:40+00:00" }, { "name": "amphp/parser", @@ -734,6 +691,10 @@ "parser", "stream" ], + "support": { + "issues": "https://github.com/amphp/parser/issues", + "source": "https://github.com/amphp/parser/tree/is-valid" + }, "time": "2017-06-06T05:29:10+00:00" }, { @@ -789,6 +750,10 @@ ], "description": "Asynchronous process manager.", "homepage": "https://github.com/amphp/process", + "support": { + "issues": "https://github.com/amphp/process/issues", + "source": "https://github.com/amphp/process/tree/master" + }, "time": "2019-02-26T16:33:03+00:00" }, { @@ -843,6 +808,10 @@ "serialization", "serialize" ], + "support": { + "issues": "https://github.com/amphp/serialization/issues", + "source": "https://github.com/amphp/serialization/tree/master" + }, "time": "2020-03-25T21:39:07+00:00" }, { @@ -918,6 +887,10 @@ "tcp", "tls" ], + "support": { + "issues": "https://github.com/amphp/socket/issues", + "source": "https://github.com/amphp/socket/tree/master" + }, "time": "2020-06-25T18:55:28+00:00" }, { @@ -976,6 +949,10 @@ "semaphore", "synchronization" ], + "support": { + "issues": "https://github.com/amphp/sync/issues", + "source": "https://github.com/amphp/sync/tree/v1.4.0" + }, "time": "2020-05-07T18:57:50+00:00" }, { @@ -1017,6 +994,10 @@ } ], "description": "Windows Registry Reader.", + "support": { + "issues": "https://github.com/amphp/windows-registry/issues", + "source": "https://github.com/amphp/windows-registry/tree/master" + }, "funding": [ { "url": "https://github.com/amphp", @@ -1064,36 +1045,41 @@ "cache", "lru" ], + "support": { + "issues": "https://github.com/cash/LRUCache/issues", + "source": "https://github.com/cash/LRUCache/tree/1.0.0" + }, "time": "2013-09-20T18:59:12+00:00" }, { "name": "cspray/labrador", - "version": "dev-main", + "version": "3.2.0-alpha", "source": { "type": "git", "url": "https://github.com/labrador-kennel/core.git", - "reference": "f1c9cdc64b48e51298fecced06de341c1fe605e0" + "reference": "4a1ef9322700aa5dc1387c885b2041be9b5475d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/labrador-kennel/core/zipball/f1c9cdc64b48e51298fecced06de341c1fe605e0", - "reference": "f1c9cdc64b48e51298fecced06de341c1fe605e0", + "url": "https://api.github.com/repos/labrador-kennel/core/zipball/4a1ef9322700aa5dc1387c885b2041be9b5475d1", + "reference": "4a1ef9322700aa5dc1387c885b2041be9b5475d1", "shasum": "" }, "require": { + "adbario/php-dot-notation": "^2.2", "amphp/amp": "^2.4", "amphp/log": "^1.1", - "cspray/labrador-async-event": "^2.2", - "cspray/labrador-exceptions": "^1.1", - "cspray/yape": "^3.0", + "cspray/labrador-async-event": "^2.3", + "cspray/labrador-exceptions": "^1.2", + "cspray/yape": "^3.1", + "ext-json": "*", "monolog/monolog": "^2.0", - "php": ">=7.2", + "php": "^7.2|^8.0", "rdlowrey/auryn": "^1.4" }, "require-dev": { "amphp/phpunit-util": "^1.2", "cspray/labrador-coding-standard": "^0.2", - "cspray/yape-cli": "^1.0", "phpunit/phpunit": "~9.1" }, "type": "library", @@ -1121,32 +1107,35 @@ "amphp", "labrador-kennel" ], - "time": "2020-07-20T04:39:56+00:00" + "support": { + "issues": "https://github.com/labrador-kennel/core/issues", + "source": "https://github.com/labrador-kennel/core/tree/3.2.0-alpha" + }, + "time": "2021-03-28T00:35:09+00:00" }, { "name": "cspray/labrador-async-event", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/labrador-kennel/async-event.git", - "reference": "c7c620d8282dc4a5db68a36ca86e379a4ca30779" + "reference": "1ee7a8849012be7e5d25e08fe343efa447f09e21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/labrador-kennel/async-event/zipball/c7c620d8282dc4a5db68a36ca86e379a4ca30779", - "reference": "c7c620d8282dc4a5db68a36ca86e379a4ca30779", + "url": "https://api.github.com/repos/labrador-kennel/async-event/zipball/1ee7a8849012be7e5d25e08fe343efa447f09e21", + "reference": "1ee7a8849012be7e5d25e08fe343efa447f09e21", "shasum": "" }, "require": { "amphp/amp": "~2.0", - "cspray/labrador-exceptions": "~1.0", - "cspray/yape": "^3.0", - "php": "~7.2" + "cspray/labrador-exceptions": "~1.2", + "cspray/yape": "^3.1", + "php": ">=7.2" }, "require-dev": { "amphp/phpunit-util": "~1.1", "cspray/labrador-coding-standard": "0.2.0", - "cspray/yape-cli": "^1.0", "phpunit/phpunit": "~8" }, "type": "library", @@ -1174,24 +1163,28 @@ "event", "labrador-kennel" ], - "time": "2020-05-02T16:05:45+00:00" + "support": { + "issues": "https://github.com/labrador-kennel/async-event/issues", + "source": "https://github.com/labrador-kennel/async-event/tree/2.3.0" + }, + "time": "2021-03-20T02:57:59+00:00" }, { "name": "cspray/labrador-exceptions", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/labrador-kennel/exception.git", - "reference": "1efc08033cd6f06f59805a2ae2c68d650edab0b5" + "reference": "e8c2bcbc87ae7229c9f7c305e2abd72bf6304078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/labrador-kennel/exception/zipball/1efc08033cd6f06f59805a2ae2c68d650edab0b5", - "reference": "1efc08033cd6f06f59805a2ae2c68d650edab0b5", + "url": "https://api.github.com/repos/labrador-kennel/exception/zipball/e8c2bcbc87ae7229c9f7c305e2abd72bf6304078", + "reference": "e8c2bcbc87ae7229c9f7c305e2abd72bf6304078", "shasum": "" }, "require": { - "php": "~7.1" + "php": ">=7.1" }, "type": "library", "autoload": { @@ -1213,24 +1206,28 @@ "role": "Benevolent Dictator For Life" } ], - "time": "2019-08-24T21:08:26+00:00" + "support": { + "issues": "https://github.com/labrador-kennel/exception/issues", + "source": "https://github.com/labrador-kennel/exception/tree/1.2.0" + }, + "time": "2021-03-19T21:46:48+00:00" }, { "name": "cspray/yape", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/cspray/yape.git", - "reference": "a94ebfeeffdb8ec28dd24847029828578aa91628" + "reference": "5d919f3300480086f63a92b5e821702e6ec9d6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cspray/yape/zipball/a94ebfeeffdb8ec28dd24847029828578aa91628", - "reference": "a94ebfeeffdb8ec28dd24847029828578aa91628", + "url": "https://api.github.com/repos/cspray/yape/zipball/5d919f3300480086f63a92b5e821702e6ec9d6f6", + "reference": "5d919f3300480086f63a92b5e821702e6ec9d6f6", "shasum": "" }, "require": { - "php": "^7.2" + "php": ">=7.2" }, "require-dev": { "phpunit/phpunit": "^9" @@ -1262,7 +1259,11 @@ "keywords": [ "enum" ], - "time": "2020-05-02T15:21:44+00:00" + "support": { + "issues": "https://github.com/cspray/yape/issues", + "source": "https://github.com/cspray/yape/tree/3.1.0" + }, + "time": "2021-03-19T21:42:16+00:00" }, { "name": "daverandom/libdns", @@ -1302,6 +1303,10 @@ "keywords": [ "dns" ], + "support": { + "issues": "https://github.com/DaveRandom/LibDNS/issues", + "source": "https://github.com/DaveRandom/LibDNS/tree/v2.0.2" + }, "time": "2019-12-03T09:12:46+00:00" }, { @@ -1351,26 +1356,30 @@ "pem", "x509" ], + "support": { + "issues": "https://github.com/kelunik/certificate/issues", + "source": "https://github.com/kelunik/certificate/tree/v1.1.2" + }, "time": "2019-05-29T19:02:31+00:00" }, { "name": "league/uri", - "version": "6.2.1", + "version": "6.4.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "6998530902550c6e3fefb5ef98d56fe92ecdb603" + "reference": "09da64118eaf4c5d52f9923a1e6a5be1da52fd9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/6998530902550c6e3fefb5ef98d56fe92ecdb603", - "reference": "6998530902550c6e3fefb5ef98d56fe92ecdb603", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/09da64118eaf4c5d52f9923a1e6a5be1da52fd9a", + "reference": "09da64118eaf4c5d52f9923a1e6a5be1da52fd9a", "shasum": "" }, "require": { "ext-json": "*", "league/uri-interfaces": "^2.1", - "php": "^7.2", + "php": ">=7.2", "psr/http-message": "^1.0" }, "conflict": { @@ -1381,12 +1390,14 @@ "phpstan/phpstan": "^0.12", "phpstan/phpstan-phpunit": "^0.12", "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^8.0 || ^9.0", + "psr/http-factory": "^1.0" }, "suggest": { "ext-fileinfo": "Needed to create Data URI from a filepath", "ext-intl": "Needed to improve host validation", - "league/uri-components": "Needed to easily manipulate URI objects" + "league/uri-components": "Needed to easily manipulate URI objects", + "psr/http-factory": "Needed to use the URI factory" }, "type": "library", "extra": { @@ -1433,38 +1444,43 @@ "url", "ws" ], + "support": { + "docs": "https://uri.thephpleague.com", + "forum": "https://thephpleague.slack.com", + "issues": "https://github.com/thephpleague/uri/issues", + "source": "https://github.com/thephpleague/uri/tree/6.4.0" + }, "funding": [ { "url": "https://github.com/sponsors/nyamsprod", "type": "github" } ], - "time": "2020-03-17T14:40:17+00:00" + "time": "2020-11-22T14:29:11+00:00" }, { "name": "league/uri-interfaces", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "0068a469958895ceaf3afcb489c0258adfa1e406" + "reference": "667f150e589d65d79c89ffe662e426704f84224f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/0068a469958895ceaf3afcb489c0258adfa1e406", - "reference": "0068a469958895ceaf3afcb489c0258adfa1e406", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/667f150e589d65d79c89ffe662e426704f84224f", + "reference": "667f150e589d65d79c89ffe662e426704f84224f", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.0", "phpstan/phpstan": "^0.12", "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0|^8.0" + "phpstan/phpstan-strict-rules": "^0.12" }, "type": "library", "extra": { @@ -1496,7 +1512,17 @@ "uri", "url" ], - "time": "2020-02-08T12:10:37+00:00" + "support": { + "issues": "https://github.com/thephpleague/uri-interfaces/issues", + "source": "https://github.com/thephpleague/uri-interfaces/tree/2.2.0" + }, + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2020-10-31T13:45:51+00:00" }, { "name": "league/uri-parser", @@ -1561,20 +1587,24 @@ "uri", "url" ], + "support": { + "issues": "https://github.com/thephpleague/uri-parser/issues", + "source": "https://github.com/thephpleague/uri-parser/tree/master" + }, "time": "2018-11-22T07:55:51+00:00" }, { "name": "monolog/monolog", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1" + "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1", - "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084", + "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084", "shasum": "" }, "require": { @@ -1587,16 +1617,17 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^6.0", + "elasticsearch/elasticsearch": "^7", "graylog2/gelf-php": "^1.4.2", + "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "php-parallel-lint/php-parallel-lint": "^1.0", "phpspec/prophecy": "^1.6.1", + "phpstan/phpstan": "^0.12.59", "phpunit/phpunit": "^8.5", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3", - "ruflin/elastica": ">=0.90 <3.0", + "ruflin/elastica": ">=0.90 <7.0.1", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { @@ -1616,7 +1647,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -1632,16 +1663,20 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ "log", "logging", "psr-3" ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.2.0" + }, "funding": [ { "url": "https://github.com/Seldaek", @@ -1652,7 +1687,7 @@ "type": "tidelift" } ], - "time": "2020-05-22T08:12:19+00:00" + "time": "2020-12-14T13:15:25+00:00" }, { "name": "nikic/fast-route", @@ -1698,6 +1733,10 @@ "router", "routing" ], + "support": { + "issues": "https://github.com/nikic/FastRoute/issues", + "source": "https://github.com/nikic/FastRoute/tree/master" + }, "time": "2018-02-13T20:26:39+00:00" }, { @@ -1748,6 +1787,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -1795,20 +1837,23 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.3" + }, "time": "2020-03-23T09:12:05+00:00" }, { "name": "rdlowrey/auryn", - "version": "v1.4.2", + "version": "v1.4.4", "source": { "type": "git", "url": "https://github.com/rdlowrey/auryn.git", - "reference": "8c4dc07943599ba84f4f89eab8cf43efeef80395" + "reference": "dae57592229d313b59414a2c8334e61e6eb00928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rdlowrey/auryn/zipball/8c4dc07943599ba84f4f89eab8cf43efeef80395", - "reference": "8c4dc07943599ba84f4f89eab8cf43efeef80395", + "url": "https://api.github.com/repos/rdlowrey/auryn/zipball/dae57592229d313b59414a2c8334e61e6eb00928", + "reference": "dae57592229d313b59414a2c8334e61e6eb00928", "shasum": "" }, "require": { @@ -1817,7 +1862,7 @@ "require-dev": { "athletic/athletic": "~0.1", "fabpot/php-cs-fixer": "~1.9", - "phpunit/phpunit": "^4.7" + "phpunit/phpunit": "^4.8" }, "type": "library", "autoload": { @@ -1831,10 +1876,10 @@ ], "authors": [ { - "name": "Dan Ackroyd", - "email": "Danack@basereality.com", - "homepage": "http://www.basereality.com", - "role": "Developer" + "name": "Daniel Lowrey", + "email": "rdlowrey@gmail.com", + "homepage": "https://github.com/rdlowrey", + "role": "Creator / Main Developer" }, { "name": "Levi Morrison", @@ -1843,10 +1888,10 @@ "role": "Developer" }, { - "name": "Daniel Lowrey", - "email": "rdlowrey@gmail.com", - "homepage": "https://github.com/rdlowrey", - "role": "Creator / Main Developer" + "name": "Dan Ackroyd", + "email": "Danack@basereality.com", + "homepage": "http://www.basereality.com", + "role": "Developer" } ], "description": "Auryn is a dependency injector for bootstrapping object-oriented PHP applications.", @@ -1856,22 +1901,26 @@ "dic", "ioc" ], - "time": "2017-05-15T06:26:46+00:00" + "support": { + "issues": "https://github.com/rdlowrey/auryn/issues", + "source": "https://github.com/rdlowrey/auryn/tree/v1.4.4" + }, + "time": "2021-03-04T20:26:52+00:00" } ], "packages-dev": [ { "name": "amphp/http-client", - "version": "v4.4.1", + "version": "v4.5.5", "source": { "type": "git", "url": "https://github.com/amphp/http-client.git", - "reference": "ba5d824253c282e1865ad95f9aaaa1db50a67f09" + "reference": "ac286c0a2bf1bf175b08aa89d3086d1e9be03985" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/http-client/zipball/ba5d824253c282e1865ad95f9aaaa1db50a67f09", - "reference": "ba5d824253c282e1865ad95f9aaaa1db50a67f09", + "url": "https://api.github.com/repos/amphp/http-client/zipball/ac286c0a2bf1bf175b08aa89d3086d1e9be03985", + "reference": "ac286c0a2bf1bf175b08aa89d3086d1e9be03985", "shasum": "" }, "require": { @@ -1948,13 +1997,17 @@ "non-blocking", "rest" ], + "support": { + "issues": "https://github.com/amphp/http-client/issues", + "source": "https://github.com/amphp/http-client/tree/v4.5.5" + }, "funding": [ { "url": "https://github.com/amphp", "type": "github" } ], - "time": "2020-07-10T16:49:21+00:00" + "time": "2020-12-23T16:54:43+00:00" }, { "name": "amphp/phpunit-util", @@ -2000,6 +2053,11 @@ ], "description": "Helper package to ease testing with PHPUnit.", "homepage": "http://amphp.org/phpunit-util", + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/phpunit-util/issues", + "source": "https://github.com/amphp/phpunit-util/tree/master" + }, "time": "2020-05-01T14:48:17+00:00" }, { @@ -2034,40 +2092,39 @@ "coding-style", "php" ], + "support": { + "issues": "https://github.com/labrador-kennel/coding-standard/issues", + "source": "https://github.com/labrador-kennel/coding-standard/tree/master" + }, "time": "2019-02-10T16:09:08+00:00" }, { "name": "doctrine/instantiator", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.0", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -2081,7 +2138,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", @@ -2090,6 +2147,10 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -2104,20 +2165,20 @@ "type": "tidelift" } ], - "time": "2020-05-29T17:27:14+00:00" + "time": "2020-11-10T18:47:58+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5" + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", - "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { @@ -2152,44 +2213,53 @@ "object", "object graph" ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + }, "funding": [ { "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", "type": "tidelift" } ], - "time": "2020-06-29T13:22:24+00:00" + "time": "2020-11-13T09:40:50+00:00" }, { - "name": "phar-io/manifest", - "version": "1.0.3", + "name": "nikic/php-parser", + "version": "v4.10.4", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-phar": "*", - "phar-io/version": "^2.0", - "php": "^5.6 || ^7.0" + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "4.9-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2197,40 +2267,96 @@ ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Nikita Popov" } ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2018-07-08T19:23:20+00:00" + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + }, + "time": "2020-12-20T10:01:03+00:00" }, { - "name": "phar-io/version", + "name": "phar-io/manifest", "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", + "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/master" + }, + "time": "2020-06-27T14:33:11+00:00" + }, + { + "name": "phar-io/version", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + "reference": "bae7c545bef187884426f042434e561ab1ddb182" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", + "reference": "bae7c545bef187884426f042434e561ab1ddb182", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -2260,7 +2386,11 @@ } ], "description": "Library for handling version information and constraints", - "time": "2018-07-08T19:19:57+00:00" + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.1.0" + }, + "time": "2021-02-23T14:00:09+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2309,20 +2439,24 @@ "reflection", "static analysis" ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + }, "time": "2020-06-27T09:03:43+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.0", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "3170448f5769fe19f456173d833734e0ff1b84df" + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df", - "reference": "3170448f5769fe19f456173d833734e0ff1b84df", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", "shasum": "" }, "require": { @@ -2361,20 +2495,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-07-20T20:05:34+00:00" + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + }, + "time": "2020-09-03T19:13:55+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651" + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", "shasum": "" }, "require": { @@ -2406,32 +2544,36 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2020-06-27T10:12:23+00:00" + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" + }, + "time": "2020-09-17T18:55:26+00:00" }, { "name": "phpspec/prophecy", - "version": "1.11.1", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160" + "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160", - "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea", + "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2", - "php": "^7.2", - "phpdocumentor/reflection-docblock": "^5.0", + "php": "^7.2 || ~8.0, <8.1", + "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { "phpspec/phpspec": "^6.0", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", "extra": { @@ -2469,44 +2611,52 @@ "spy", "stub" ], - "time": "2020-07-08T12:44:21+00:00" + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/1.13.0" + }, + "time": "2021-03-17T13:42:18+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "9.2.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "f6293e1b30a2354e8428e004689671b83871edde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde", + "reference": "f6293e1b30a2354e8428e004689671b83871edde", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "nikic/php-parser": "^4.10.2", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-pcov": "*", + "ext-xdebug": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -2532,32 +2682,42 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-03-28T07:26:59+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.2", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "050bedf145a257b1ff02746c31894800e5122946" + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", - "reference": "050bedf145a257b1ff02746c31894800e5122946", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2582,26 +2742,48 @@ "filesystem", "iterator" ], - "time": "2018-09-13T20:33:42+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:57:25+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -2618,37 +2800,47 @@ "role": "lead" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", "keywords": [ - "template" + "process" ], - "time": "2015-06-21T13:50:34+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" }, { - "name": "phpunit/php-timer", - "version": "2.1.2", + "name": "phpunit/php-text-template", + "version": "2.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", - "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2667,38 +2859,47 @@ "role": "lead" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "timer" + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "time": "2019-06-07T04:22:29+00:00" + "time": "2020-10-26T05:33:50+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "3.1.1", + "name": "phpunit/php-timer", + "version": "5.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff", - "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": "^7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2713,65 +2914,78 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "tokenizer" + "timer" ], - "time": "2019-09-17T06:23:10+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", - "version": "7.5.20", + "version": "9.5.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + "reference": "c73c6737305e779771147af66c96ca6a7ed8a741" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741", + "reference": "c73c6737305e779771147af66c96ca6a7ed8a741", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.3.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", - "sebastian/version": "^2.0.1" - }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.1", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpspec/prophecy": "^1.12.1", + "phpunit/php-code-coverage": "^9.2.3", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.5", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.3", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^2.3", + "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*" + "ext-pdo": "*", + "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "ext-xdebug": "*" }, "bin": [ "phpunit" @@ -2779,12 +2993,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "9.5-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2805,32 +3022,158 @@ "testing", "xunit" ], - "time": "2020-01-08T08:45:45+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4" + }, + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-03-23T07:16:29+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", + "name": "sebastian/cli-parser", "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2850,34 +3193,44 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.2", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" + "reference": "55f4261989e546dc112258c7a75935a81a7ce382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", - "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", + "reference": "55f4261989e546dc112258c7a75935a81a7ce382", "shasum": "" }, "require": { - "php": "^7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2890,6 +3243,10 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -2901,10 +3258,6 @@ { "name": "Bernhard Schussek", "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" } ], "description": "Provides the functionality to compare PHP values for equality", @@ -2914,33 +3267,100 @@ "compare", "equality" ], - "time": "2018-07-12T15:12:46+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:49:45+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.7", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:52:27+00:00" }, { "name": "sebastian/diff", - "version": "3.0.2", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", - "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2953,13 +3373,13 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" } ], "description": "Diff implementation", @@ -2970,27 +3390,37 @@ "unidiff", "unified diff" ], - "time": "2019-02-04T06:01:07+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:10:38+00:00" }, { "name": "sebastian/environment", - "version": "4.2.3", + "version": "5.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368" + "reference": "388b6ced16caa751030f6a69e588299fa09200ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368", - "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", + "reference": "388b6ced16caa751030f6a69e588299fa09200ac", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -2998,7 +3428,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3023,34 +3453,44 @@ "environment", "hhvm" ], - "time": "2019-11-20T08:46:58+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:52:38+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.2", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e" + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3090,27 +3530,40 @@ "export", "exporter" ], - "time": "2019-09-14T09:02:43+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:24:23+00:00" }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "a90ccbddffa067b51f574dea6eb25d5680839455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455", + "reference": "a90ccbddffa067b51f574dea6eb25d5680839455", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -3118,7 +3571,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -3141,34 +3594,101 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:55:19+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.6", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-28T06:42:11+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3188,32 +3708,42 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.1", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "773f97c67f28de00d397be301821b06708fca0be" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", - "reference": "773f97c67f28de00d397be301821b06708fca0be", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -3233,32 +3763,42 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.0", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3271,14 +3811,14 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, { "name": "Adam Harvey", "email": "aharvey@php.net" @@ -3286,29 +3826,42 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:17:30+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -3328,29 +3881,95 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2018-10-04T04:07:39+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:45:17+00:00" + }, + { + "name": "sebastian/type", + "version": "2.3.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2", + "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/2.3.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:18:59+00:00" }, { "name": "sebastian/version", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "reference": "c6c1022351a901512170118436c764e473f6de8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -3371,20 +3990,30 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.5", + "version": "3.5.8", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", "shasum": "" }, "require": { @@ -3422,24 +4051,29 @@ "phpcs", "standards" ], - "time": "2020-04-17T01:09:41+00:00" + "support": { + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + }, + "time": "2020-10-23T02:01:07+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -3447,7 +4081,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3484,6 +4118,9 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -3498,7 +4135,7 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "theseer/tokenizer", @@ -3538,6 +4175,10 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/master" + }, "funding": [ { "url": "https://github.com/theseer", @@ -3548,30 +4189,35 @@ }, { "name": "webmozart/assert", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + "url": "https://github.com/webmozarts/assert.git", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -3593,21 +4239,24 @@ "check", "validate" ], - "time": "2020-07-08T17:02:28+00:00" + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.10.0" + }, + "time": "2021-03-09T10:59:23+00:00" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "cspray/labrador": 20, - "amphp/http-client": 5 + "cspray/labrador": 15 }, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~7.2", + "php": "^7.2|^8.0", "ext-json": "*" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..7b29f34 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,22 @@ + + + + + ./src + + + + + + + + + + ./test + ./test + + + + + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist deleted file mode 100644 index f69f123..0000000 --- a/phpunit.xml.dist +++ /dev/null @@ -1,38 +0,0 @@ - - - - ./test - ./test - - - - - - ./src - - - diff --git a/src/DefaultHttpApplication.php b/src/DefaultHttpApplication.php new file mode 100644 index 0000000..dbb7b52 --- /dev/null +++ b/src/DefaultHttpApplication.php @@ -0,0 +1,99 @@ +router = $router; + $this->socketServers = $socketServers; + $this->exceptionToResponseHandler = function(/* Throwable $error */) { + return new Response(Status::INTERNAL_SERVER_ERROR); + }; + } + + /** + * Add a Middleware that will be invoked _before_ the application attempts to match the given Request to the Router + * AND will be invoked for _every_ request. + * + * Generally speaking you should avoid adding too many Middleware to this and let the Router and Controllers control + * your application flow, pun intended. Instead you should reserve this for low-level aspects of HTTP Requests. One + * of the primary use cases for this Middleware is to support CORS before the Router has an opportunity to send a + * Method Not Allowed response for OPTIONS requests. + * + * @param Middleware $middleware + */ + public function addMiddleware(Middleware $middleware) : void { + $this->middlewares[] = $middleware; + } + + /** + * Perform whatever logic or operations your application requires; return a Promise that resolves when you app is + * finished running. + * + * This method should avoid throwing an exception and instead fail the Promise with the Exception that caused the + * application to crash. + * + * @return Promise + */ + protected function doStart() : Promise { + $applicationHandler = new CallableRequestHandler(function(Request $request) { + try { + $controller = $this->router->match($request); + $response = yield $controller->handleRequest($request); + return $response; + } catch (\Throwable $error) { + $msgFormat = 'Exception thrown processing %s %s. Message: %s'; + $msg = sprintf($msgFormat, $request->getMethod(), $request->getUri(), $error->getMessage()); + $this->logger->critical($msg, ['exception' => $error]); + return $this->exceptionToResponse($error); + } + }); + return call(function() use($applicationHandler) { + $handler = Middleware\stack($applicationHandler, ...$this->middlewares); + $this->httpServer = new HttpServer($this->socketServers, $handler, $this->logger); + + return $this->httpServer->start(); + }); + } + + public function stop() : Promise { + // We only need to call stop on the httpServer. The AbstractApplication handling of the doStart promise will + // properly set the state of the app and deal with any other deferrables when this promise resolves + return $this->httpServer->stop(); + } + + public function setExceptionToResponseHandler(callable $callback) : void { + $this->exceptionToResponseHandler = $callback; + } + + protected function exceptionToResponse(\Throwable $throwable) : Response { + return ($this->exceptionToResponseHandler)($throwable); + } +} diff --git a/src/DependencyGraph.php b/src/DependencyGraph.php deleted file mode 100644 index c154379..0000000 --- a/src/DependencyGraph.php +++ /dev/null @@ -1,62 +0,0 @@ -coreDependencyGraph = $coreDependencyGraph; - } - - public function wireObjectGraph(Injector $injector = null) : Injector { - $injector = $injector ?? new Injector(); - - $this->registerCoreServices($injector); - $this->registerRouterServices($injector); - - return $injector; - } - - private function registerCoreServices(Injector $injector) { - $this->coreDependencyGraph->wireObjectGraph($injector); - } - - private function registerRouterServices(Injector $injector) { - $injector->share(Application::class); - $injector->alias(Application::class, HttpApplication::class); - $injector->prepare(Application::class, function(Application $app, Injector $injector) { - $injector->execute([$app, 'registerPluginLoadHandler'], [ - RouterPlugin::class, - function(RouterPlugin $plugin) use($injector) { - $injector->execute([$plugin, 'registerRoutes']); - } - ]); - }); - $injector->share(RouteCollector::class); - $injector->define(RouteCollector::class, [ - 'routeParser' => StdRouteParser::class, - 'dataGenerator' => GcbGenerator::class - ]); - $injector->share(Router\FastRouteRouter::class); - $injector->define(Router\FastRouteRouter::class, [ - 'collector' => RouteCollector::class, - ':dispatcherCb' => function(array $data) use($injector) { - return $injector->make(GcbDispatcher::class, [':data' => $data]); - } - ]); - $injector->alias(Router\Router::class, Router\FastRouteRouter::class); - } -} diff --git a/src/HttpApplication.php b/src/HttpApplication.php index eed591a..3a1b24b 100644 --- a/src/HttpApplication.php +++ b/src/HttpApplication.php @@ -2,145 +2,12 @@ namespace Cspray\Labrador\Http; -use Amp\Deferred; -use Amp\Http\Server\ServerObserver; -use Amp\Success; -use Cspray\Labrador\Http\Router\Router; -use Cspray\Labrador\AbstractApplication; - -use Amp\Http\Status; use Amp\Http\Server\Middleware; -use Amp\Http\Server\RequestHandler\CallableRequestHandler; -use Amp\Http\Server\Request; -use Amp\Http\Server\Response; -use Amp\Http\Server\Server as HttpServer; -use Amp\Promise; -use Amp\Socket\Server as SocketServer; -use Cspray\Labrador\Plugin\Pluggable; - -use function Amp\call; - -final class HttpApplication extends AbstractApplication { - - private $router; - private $socketServers; - private $exceptionToResponseHandler; - private $middlewares = []; - - /** - * @var HttpServer - */ - private $httpServer; - - public function __construct(Pluggable $pluginManager, Router $router, SocketServer ...$socketServers) { - parent::__construct($pluginManager); - $this->router = $router; - $this->socketServers = $socketServers; - $this->exceptionToResponseHandler = function(/* Throwable $error */) { - return new Response(Status::INTERNAL_SERVER_ERROR); - }; - } - - /** - * Add a Middleware that will be invoked _before_ the application attempts to match the given Request to the Router - * AND will be invoked for _every_ request. - * - * Generally speaking you should avoid adding too many Middleware to this and let the Router and Controllers control - * your application flow, pun intended. Instead you should reserve this for low-level aspects of HTTP Requests. One - * of the primary use cases for this Middleware is to support CORS before the Router has an opportunity to send a - * Method Not Allowed response for OPTIONS requests. - * - * @param Middleware $middleware - */ - public function addMiddleware(Middleware $middleware) : void { - $this->middlewares[] = $middleware; - } - - /** - * Perform whatever logic or operations your application requires; return a Promise that resolves when you app is - * finished running. - * - * This method should avoid throwing an exception and instead fail the Promise with the Exception that caused the - * application to crash. - * - * @return Promise - */ - protected function doStart() : Promise { - $applicationHandler = new CallableRequestHandler(function(Request $request) { - try { - $controller = $this->router->match($request); - $response = yield $controller->handleRequest($request); - return $response; - } catch (\Throwable $error) { - $msgFormat = 'Exception thrown processing %s %s. Message: %s'; - $msg = sprintf($msgFormat, $request->getMethod(), $request->getUri(), $error->getMessage()); - $this->logger->critical($msg, ['exception' => $error]); - return $this->exceptionToResponse($error); - } - }); - - - return call(function() use($applicationHandler) { - $deferred = new Deferred(); - - $handler = Middleware\stack($applicationHandler, ...$this->middlewares); - $this->httpServer = new HttpServer($this->socketServers, $handler, $this->logger); - - $this->httpServer->attach($this->getServerObserver($deferred)); - - yield $this->httpServer->start(); - - return $deferred->promise(); - }); - } - - public function stop() : Promise { - // we should only need to stop the http server, the ServerObserver will resolve the deferred when server stops - return $this->httpServer->stop(); - } - - public function setExceptionToResponseHandler(callable $callback) : void { - $this->exceptionToResponseHandler = $callback; - } - - private function exceptionToResponse(\Throwable $throwable) : Response { - return ($this->exceptionToResponseHandler)($throwable); - } - - private function getServerObserver(Deferred $deferred) : ServerObserver { - return new class($deferred) implements ServerObserver { - - private $deferred; +use Cspray\Labrador\Application; - public function __construct(Deferred $deferred) { - $this->deferred = $deferred; - } +interface HttpApplication extends Application { - /** - * Invoked when the server is starting. Server sockets have been opened, but are not yet accepting client - * connections. This method should be used to set up any necessary state for responding to requests, - * including starting loop watchers such as timers. - * - * @param HttpServer $server - * - * @return Promise - */ - public function onStart(HttpServer $server) : Promise { - return new Success(); - } + public function addMiddleware(Middleware $middleware) : void; - /** - * Invoked when the server has initiated stopping. No further requests are accepted and any connected - * clients should be closed gracefully and any loop watchers cancelled. - * - * @param HttpServer $server - * - * @return Promise - */ - public function onStop(HttpServer $server) : Promise { - $this->deferred->resolve(); - return new Success(); - } - }; - } + public function setExceptionToResponseHandler(callable $callable) : void; } diff --git a/src/Router/FastRouteRouter.php b/src/Router/FastRouteRouter.php index b84b0fc..b80d53f 100644 --- a/src/Router/FastRouteRouter.php +++ b/src/Router/FastRouteRouter.php @@ -18,7 +18,7 @@ /** * A Router implementation that makes use of FastRoute to do the actual heavy lifting. */ -class FastRouteRouter implements Router { +final class FastRouteRouter implements Router { private $dispatcherCb; private $collector; diff --git a/src/Router/FriendlyRouter.php b/src/Router/FriendlyRouter.php index 6ac8aa5..aac51ff 100644 --- a/src/Router/FriendlyRouter.php +++ b/src/Router/FriendlyRouter.php @@ -10,7 +10,7 @@ * A Router that acts as a decorator over other Router implementations and provides convenience methods for defining * complex routing. */ -class FriendlyRouter implements Router { +final class FriendlyRouter implements Router { private $mounts = [ 'prefix' => [], diff --git a/test/DependencyGraphTest.php b/test/DependencyGraphTest.php deleted file mode 100644 index ce0006c..0000000 --- a/test/DependencyGraphTest.php +++ /dev/null @@ -1,68 +0,0 @@ -logger = new NullLogger(); - } - - public function testServicesRegisteredCorrectly() { - $subject = new DependencyGraph(new CoreDependencyGraph($this->logger)); - $injector = $subject->wireObjectGraph(); - - $emitter = $injector->make(EventEmitter::class); - $this->assertInstanceOf(AmpEventEmitter::class, $emitter); - - $engine = $injector->make(Engine::class); - $this->assertInstanceOf(AmpEngine::class, $engine); - - $router = $injector->make(Router::class); - $this->assertInstanceOf(FastRouteRouter::class, $router); - } - - public function testPluginManagerInjectorShared() { - $subject = new DependencyGraph(new CoreDependencyGraph($this->logger)); - $injector = $subject->wireObjectGraph(); - $pluginManager = $injector->make(PluginManager::class); - // normally we would not test private property accessors this way but it saves us from having to share the - // Aury\Injector with itself and promoting the use of a service locator pattern. - $reflectedPluginManager = new \ReflectionClass($pluginManager); - $reflectedInjector = $reflectedPluginManager->getProperty('injector'); - $reflectedInjector->setAccessible(true); - - $this->assertSame($injector, $reflectedInjector->getValue($pluginManager)); - } - - public function testEngineLoadsRouterPlugin() { - $subject = new DependencyGraph(new CoreDependencyGraph($this->logger)); - $injector = $subject->wireObjectGraph(); - /** @var Application $app */ - $app = $injector->make(Application::class, [':socketServers' => new Server(@fopen('/dev/null', 'rb'))]); - - $app->registerPlugin(TestRouterPlugin::class); - yield $app->loadPlugins(); - - $router = $injector->make(Router::class); - $this->assertSame($app->getLoadedPlugin(TestRouterPlugin::class)->router, $router); - } -} diff --git a/test/HttpApplicationTest.php b/test/HttpApplicationTest.php index 0f54a60..ac289d3 100644 --- a/test/HttpApplicationTest.php +++ b/test/HttpApplicationTest.php @@ -19,7 +19,7 @@ use Amp\Socket\Server as SocketServer; use Amp\Socket\SocketException; use Amp\Success; -use Cspray\Labrador\Http\HttpApplication; +use Cspray\Labrador\Http\DefaultHttpApplication; use Cspray\Labrador\Http\Router\FastRouteRouter; use Cspray\Labrador\Http\Router\Router; use Cspray\Labrador\Http\Test\Stub\ErrorThrowingController; @@ -45,22 +45,31 @@ class HttpApplicationTest extends AsyncTestCase { private $pluginManager; + private $application; + + private $router; + /** * @throws SocketException */ - public function setUp() { - parent::setUp(); + public function setUpAsync() { + parent::setUpAsync(); $this->setTimeout(1500); $this->socketServer = SocketServer::listen('tcp://127.0.0.1:0'); $this->client = HttpClientBuilder::buildDefault(); $emitter = new AmpEventEmitter(); $injector = new Injector(); $this->pluginManager = new PluginManager($injector, $emitter); + $this->router = $this->getRouter(); + $this->application = new DefaultHttpApplication( + $this->pluginManager, + $this->router, + $this->socketServer + ); } - public function tearDown() { - parent::tearDown(); - $this->socketServer->close(); + public function tearDownAsync() { + yield $this->application->stop(); } private function getRouter() { @@ -78,17 +87,11 @@ private function registerRoutes(Router $router) { $router->addRoute('GET', '/throw-error', $errorController); } - private function stopServer(HttpApplication $application) : Promise { - return $application->stop(); - } - public function testBasicRouteFound() { - $router = $this->getRouter(); - $application = new HttpApplication($this->pluginManager, $router, $this->socketServer); - $application->setLogger(new NullLogger()); - $this->registerRoutes($router); + $this->application->setLogger(new NullLogger()); + $this->registerRoutes($this->router); - $application->start(); + yield $this->application->start(); /** @var ClientResponse $response */ $response = yield $this->client->request( @@ -98,16 +101,12 @@ public function testBasicRouteFound() { $this->assertSame(Status::OK, $response->getStatus()); $this->assertSame('From controller', $body); - - yield $this->stopServer($application); } public function testRouteNotFound() { - $router = $this->getRouter(); - $application = new HttpApplication($this->pluginManager, $router, $this->socketServer); - $application->setLogger(new NullLogger()); - $this->registerRoutes($router); - $application->start(); + $this->application->setLogger(new NullLogger()); + $this->registerRoutes($this->router); + yield $this->application->start(); /** @var ClientResponse $response */ $response = yield $this->client->request( @@ -117,16 +116,13 @@ public function testRouteNotFound() { $this->assertSame(Status::NOT_FOUND, $response->getStatus()); $this->assertSame('Not Found', $body); - - yield $this->stopServer($application); } public function testHandlesErrorGracefully() { - $router = $this->getRouter(); - $application = new HttpApplication($this->pluginManager, $router, $this->socketServer); - $application->setLogger(new NullLogger()); - $this->registerRoutes($router); - $application->start(); + $this->application->setLogger(new NullLogger()); + $this->registerRoutes($this->router); + + yield $this->application->start(); $url = 'http://' . $this->socketServer->getAddress() . '/throw-error'; /** @var ClientResponse $response */ @@ -142,32 +138,25 @@ public function testHandlesErrorGracefully() { $this->assertSame(Status::OK, $response->getStatus()); $this->assertSame('From controller', $body); - - yield $this->stopServer($application); } public function testErrorResponseReturnedFromApplication() { - $router = $this->getRouter(); - $application = new HttpApplication($this->pluginManager, $router, $this->socketServer); - $application->setLogger(new NullLogger()); - $application->setExceptionToResponseHandler(function(\Throwable $error) { + $this->application->setLogger(new NullLogger()); + $this->application->setExceptionToResponseHandler(function(\Throwable $error) { return new ServerResponse(Status::SERVICE_UNAVAILABLE); }); - $this->registerRoutes($router); - $application->start(); + $this->registerRoutes($this->router); + yield $this->application->start(); $url = 'http://' . $this->socketServer->getAddress() . '/throw-error'; /** @var ClientResponse $response */ $response = yield $this->client->request(new ClientRequest($url)); $this->assertSame(Status::SERVICE_UNAVAILABLE, $response->getStatus()); - - yield $this->stopServer($application); } public function testErrorLogged() { - $router = $this->getRouter(); $logger = $this->createMock(LoggerInterface::class); $expectedMsg = 'Exception thrown processing GET http://' . $this->socketServer->getAddress() . '/throw-error.'; $expectedMsg .= ' Message: Controller thrown exception'; @@ -178,23 +167,24 @@ public function testErrorLogged() { return $exception instanceof \Exception && $exception->getMessage() === 'Controller thrown exception'; })); - $application = new HttpApplication($this->pluginManager, $router, $this->socketServer); - $application->setLogger($logger); + $this->application->setLogger($logger); - $this->registerRoutes($router); - $application->start(); + $this->registerRoutes($this->router); + yield $this->application->start(); yield $this->client->request(new ClientRequest('http://' . $this->socketServer->getAddress() . '/throw-error')); - - yield $this->stopServer($application); } public function testAddingMiddlewareCanShortCircuitRouterMatching() { $router = $this->createMock(Router::class); $router->expects($this->never())->method('match'); $logger = new NullLogger(); - $application = new HttpApplication($this->pluginManager, $router, $this->socketServer); - $application->setLogger($logger); + $this->application->setLogger($logger); + $reflectedApp = new \ReflectionObject($this->application); + $reflectedProp = $reflectedApp->getProperty('router'); + $reflectedProp->setAccessible(true); + $reflectedProp->setValue($this->application, $router); + $middleware = new class implements Middleware { /** @@ -208,9 +198,9 @@ public function handleRequest(ServerRequest $request, RequestHandler $requestHan return new Success($response); } }; - $application->addMiddleware($middleware); + $this->application->addMiddleware($middleware); - $application->start(); + yield $this->application->start(); /** @var ClientResponse $response */ $url = 'http://' . $this->socketServer->getAddress() . '/does_not_matter'; @@ -219,7 +209,5 @@ public function handleRequest(ServerRequest $request, RequestHandler $requestHan $this->assertSame(Status::ACCEPTED, $response->getStatus()); $this->assertSame('Short circuited router', $body); - - yield $this->stopServer($application); } } diff --git a/test/Router/FastRouteRouterTest.php b/test/Router/FastRouteRouterTest.php index 8a0a3ba..7b8cab7 100644 --- a/test/Router/FastRouteRouterTest.php +++ b/test/Router/FastRouteRouterTest.php @@ -9,8 +9,8 @@ namespace Cspray\Labrador\Http\Test\Router; -use Amp\PHPUnit\AsyncTestCase; use Amp\Http\Server\Driver\Client; +use Amp\PHPUnit\AsyncTestCase; use Cspray\Labrador\Http\Controller\Controller; use Cspray\Labrador\Http\Router\FastRouteRouter; use Cspray\Labrador\Http\Router\Route; @@ -35,7 +35,7 @@ class FastRouteRouterTest extends AsyncTestCase { */ private $client; - public function setUp() { + public function setUp() : void { parent::setUp(); $this->client = $this->createMock(Client::class); $this->setTimeout(1500); diff --git a/test/Router/FriendlyRouterTest.php b/test/Router/FriendlyRouterTest.php index 8220e61..90baa50 100644 --- a/test/Router/FriendlyRouterTest.php +++ b/test/Router/FriendlyRouterTest.php @@ -14,36 +14,25 @@ class FriendlyRouterTest extends TestCase { private $mockRouter; - private $client; - public function setUp() { + public function setUp() : void { parent::setUp(); - $this->client = $this->createMock(Client::class); $this->mockRouter = $this->createMock(Router::class); } - private function getRouter() { + private function getRouter() : FriendlyRouter { return new FriendlyRouter($this->mockRouter); } - public function routerRouteMethodProvider() { - return [ - ['GET'], - ['POST'], - ['PUT'], - ['DELETE'], - ]; - } - public function testMountingRouterAddsPrefix() { $mountedController = $this->createMock(Controller::class); $unmountedController = $this->createMock(Controller::class); - $this->mockRouter->expects($this->at(0)) + $this->mockRouter->expects($this->exactly(2)) ->method('addRoute') - ->with('GET', '/prefix/foo', $mountedController); - $this->mockRouter->expects($this->at(1)) - ->method('addRoute') - ->with('GET', '/noprefix', $unmountedController); + ->withConsecutive( + ['GET', '/prefix/foo', $mountedController], + ['GET', '/noprefix', $unmountedController] + ); $router = $this->getRouter(); $router->mount('/prefix', function (FriendlyRouter $router) use ($mountedController) { @@ -57,15 +46,14 @@ public function testNestedMountingAddsCorrectPrefixes() { $barPostController = $this->createMock(Controller::class); $bazPutController = $this->createMock(Controller::class); - $this->mockRouter->expects($this->at(0)) - ->method('addRoute') - ->with('GET', '/foo/foo-get', $fooGetController); - $this->mockRouter->expects($this->at(1)) + $this->mockRouter->expects($this->exactly(3)) ->method('addRoute') - ->with('POST', '/foo/bar/bar-post', $barPostController); - $this->mockRouter->expects($this->at(2)) - ->method('addRoute') - ->with('PUT', '/foo/bar/baz/baz-put', $bazPutController); + ->withConsecutive( + ['GET', '/foo/foo-get', $fooGetController], + ['POST', '/foo/bar/bar-post', $barPostController], + ['PUT', '/foo/bar/baz/baz-put', $bazPutController] + ); + $router = $this->getRouter(); $router->mount('/foo', function(FriendlyRouter $router) use( $fooGetController, $barPostController, $bazPutController @@ -82,23 +70,17 @@ public function testNestedMountingAddsCorrectPrefixes() { public function testAddingMiddlewareToMountedRoute() { $controller = $this->createMock(Controller::class); - $defaultMiddlewares = [ - $this->createMock(Middleware::class), - $this->createMock(Middleware::class) - ]; + $middlewareA = $this->createMock(Middleware::class); + $middlewareB = $this->createMock(Middleware::class); - $this->mockRouter->expects($this->at(0)) + $this->mockRouter->expects($this->exactly(4)) ->method('addRoute') - ->with('GET', '/foo/bar', $controller, ...$defaultMiddlewares); - $this->mockRouter->expects($this->at(1)) - ->method('addRoute') - ->with('POST', '/foo/bar', $controller, ...$defaultMiddlewares); - $this->mockRouter->expects($this->at(2)) - ->method('addRoute') - ->with('PUT', '/foo/bar', $controller, ...$defaultMiddlewares); - $this->mockRouter->expects($this->at(3)) - ->method('addRoute') - ->with('DELETE', '/foo/bar', $controller, ...$defaultMiddlewares); + ->withConsecutive( + ['GET', '/foo/bar', $controller, $middlewareA, $middlewareB], + ['POST', '/foo/bar', $controller, $middlewareA, $middlewareB], + ['PUT', '/foo/bar', $controller, $middlewareA, $middlewareB], + ['DELETE', '/foo/bar', $controller, $middlewareA, $middlewareB] + ); $router = $this->getRouter(); $router->mount('/foo', function(FriendlyRouter $router) use($controller) { @@ -106,26 +88,25 @@ public function testAddingMiddlewareToMountedRoute() { $router->post('/bar', $controller); $router->put('/bar', $controller); $router->delete('/bar', $controller); - }, ...$defaultMiddlewares); + }, $middlewareA, $middlewareB); } public function testMultipleMountsOnlyAddsMiddlewareAppropriately() { $controller = $this->createMock(Controller::class); - $defaultMiddlewares = [ - $this->createMock(Middleware::class), - $this->createMock(Middleware::class) - ]; + $middlewareA = $this->createMock(Middleware::class); + $middlewareB = $this->createMock(Middleware::class); - $this->mockRouter->expects($this->at(0)) - ->method('addRoute') - ->with('GET', '/foo/bar', $controller, ...$defaultMiddlewares); - $this->mockRouter->expects($this->at(1)) + $this->mockRouter->expects($this->exactly(2)) ->method('addRoute') - ->with('POST', '/foo/bar', $controller); + ->withConsecutive( + ['GET', '/foo/bar', $controller, $middlewareA, $middlewareB], + ['POST', '/foo/bar', $controller] + ); + $router = $this->getRouter(); $router->mount('/foo', function(FriendlyRouter $router) use($controller) { $router->get('/bar', $controller); - }, ...$defaultMiddlewares); + }, $middlewareA, $middlewareB); $router->mount('/foo', function(FriendlyRouter $router) use($controller) { $router->post('/bar', $controller); });