From 08d194ede1c515c6e3569c25548432e6280f9bdb Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 11 Jan 2021 21:41:27 +0100 Subject: [PATCH 01/15] Add interfaces --- .idea/php.xml | 114 ++- .idea/query-interface.iml | 90 +- composer.json | 8 +- composer.lock | 1430 ++++++++++++++------------- src/.gitkeep | 0 src/QueryInterface.php | 51 + src/StringQueryFactoryInterface.php | 25 + 7 files changed, 910 insertions(+), 808 deletions(-) delete mode 100644 src/.gitkeep create mode 100644 src/QueryInterface.php create mode 100644 src/StringQueryFactoryInterface.php diff --git a/.idea/php.xml b/.idea/php.xml index f881867..4c163c6 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -2,66 +2,63 @@ - - - - - - - - - - - - - + + + + + + - - - - - - - - - - + + - - - - - - + + + + - - + + + - - - + + + + + + + + - - + + + + + + + + + + + + + + + - - - - - - + - + @@ -70,7 +67,7 @@ - + @@ -86,14 +83,18 @@ - + - /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini + /usr/local/etc/php/conf.d/docker-php-ext-pcntl.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini /usr/local/etc/php/php.ini - + + + + + @@ -115,6 +116,7 @@ + @@ -124,6 +126,7 @@ + @@ -131,18 +134,14 @@ - - - /usr/local/etc/php/conf.d/docker-php-ext-pcntl.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini + + + /usr/local/etc/php/php.ini - - - - - + @@ -164,17 +163,14 @@ - - - @@ -184,7 +180,7 @@ - + diff --git a/.idea/query-interface.iml b/.idea/query-interface.iml index afc8582..66b6c6b 100644 --- a/.idea/query-interface.iml +++ b/.idea/query-interface.iml @@ -2,63 +2,61 @@ - - - - + + + + - - - - - - - - - - - - - - - - + + + - - + + + + + + - - - - - - - - - - - - - - + + + + + + - + - - + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + diff --git a/composer.json b/composer.json index e4534e9..d52096f 100644 --- a/composer.json +++ b/composer.json @@ -11,12 +11,14 @@ } ], "require": { - "php": "^7.2" + "php": "^7.1", + "dhii/collections-interface": "^v0.3.0-alpha1" }, "require-dev": { - "phpunit/phpunit": "^8.0 | ^9.0", + "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", "vimeo/psalm": "^3.11.7", - "slevomat/coding-standard": "^6.0" + "slevomat/coding-standard": "^6.0", + "symfony/polyfill-php80": "^1.19" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index b34af2f..b6bbf84 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,118 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d956b1f7d58bdf89adabb4858330c1a4", - "packages": [], + "content-hash": "88ccebbf33001c8342bf7f35e0839984", + "packages": [ + { + "name": "dhii/collections-interface", + "version": "dev-develop", + "source": { + "type": "git", + "url": "https://github.com/Dhii/collections-interface.git", + "reference": "0fa5a14c407995cb0b9634ee42f127a91f24aafc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/0fa5a14c407995cb0b9634ee42f127a91f24aafc", + "reference": "0fa5a14c407995cb0b9634ee42f127a91f24aafc", + "shasum": "" + }, + "require": { + "php": "^7.1", + "psr/container": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 | ^8.0", + "slevomat/coding-standard": "^6.0", + "vimeo/psalm": "^3.0" + }, + "default-branch": true, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Dhii\\Collection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dhii Team", + "email": "development@dhii.co" + }, + { + "name": "Anton Ukhanev", + "email": "xedin.unknown@gmail.com" + } + ], + "description": "A highly ISP-compliant collection of interfaces that represent maps and lists.", + "support": { + "issues": "https://github.com/Dhii/collections-interface/issues", + "source": "https://github.com/Dhii/collections-interface/tree/v0.3.0-alpha2" + }, + "time": "2020-10-13T08:27:37+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/master" + }, + "time": "2017-02-14T16:28:37+00:00" + } + ], "packages-dev": [ { "name": "amphp/amp", @@ -13,12 +123,12 @@ "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "3a4c13ad9b8b7cc0e5ceba1d7ba5a25b3b5bfa2e" + "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/3a4c13ad9b8b7cc0e5ceba1d7ba5a25b3b5bfa2e", - "reference": "3a4c13ad9b8b7cc0e5ceba1d7ba5a25b3b5bfa2e", + "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9", + "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9", "shasum": "" }, "require": { @@ -33,6 +143,7 @@ "psalm/phar": "^3.11@dev", "react/promise": "^2" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -83,13 +194,18 @@ "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-08-30T19:22:25+00:00" + "time": "2021-01-10T17:06:37+00:00" }, { "name": "amphp/byte-stream", @@ -117,6 +233,7 @@ "phpunit/phpunit": "^6 || ^7 || ^8", "psalm/phar": "^3.11.4" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -155,6 +272,11 @@ "non-blocking", "stream" ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/master" + }, "funding": [ { "url": "https://github.com/amphp", @@ -169,12 +291,12 @@ "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "c8c9aa8a14cc3d3bec86d0a8c3fa52ea79936855" + "reference": "f921205948ab93bb19f86327c793a81edb62f236" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c8c9aa8a14cc3d3bec86d0a8c3fa52ea79936855", - "reference": "c8c9aa8a14cc3d3bec86d0a8c3fa52ea79936855", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/f921205948ab93bb19f86327c793a81edb62f236", + "reference": "f921205948ab93bb19f86327c793a81edb62f236", "shasum": "" }, "require": { @@ -189,6 +311,7 @@ "ext-zip": "^1.13", "phpunit/phpunit": "^6.5 || ^7" }, + "default-branch": true, "type": "composer-plugin", "extra": { "class": "PackageVersions\\Installer", @@ -216,6 +339,10 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/master" + }, "funding": [ { "url": "https://packagist.com", @@ -230,7 +357,7 @@ "type": "tidelift" } ], - "time": "2020-08-25T05:50:16+00:00" + "time": "2020-12-27T20:11:05+00:00" }, { "name": "composer/semver", @@ -238,21 +365,22 @@ "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "ebb714493b3a54f1dbbec6b15ab7bc9b3440e17b" + "reference": "dd61cb4efbd0cff1700b217faf24ce596af4fc4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/ebb714493b3a54f1dbbec6b15ab7bc9b3440e17b", - "reference": "ebb714493b3a54f1dbbec6b15ab7bc9b3440e17b", + "url": "https://api.github.com/repos/composer/semver/zipball/dd61cb4efbd0cff1700b217faf24ce596af4fc4e", + "reference": "dd61cb4efbd0cff1700b217faf24ce596af4fc4e", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.19", + "phpstan/phpstan": "^0.12.54", "symfony/phpunit-bridge": "^4.2 || ^5" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -292,6 +420,11 @@ "validation", "versioning" ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/main" + }, "funding": [ { "url": "https://packagist.com", @@ -306,20 +439,20 @@ "type": "tidelift" } ], - "time": "2020-09-27T13:14:03+00:00" + "time": "2020-12-10T07:55:43+00:00" }, { "name": "composer/xdebug-handler", - "version": "1.4.3", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ebd27a9866ae8254e873866f795491f02418c5a5" + "reference": "f28d44c286812c714741478d968104c5e604a1d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5", - "reference": "ebd27a9866ae8254e873866f795491f02418c5a5", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", + "reference": "f28d44c286812c714741478d968104c5e604a1d4", "shasum": "" }, "require": { @@ -350,6 +483,11 @@ "Xdebug", "performance" ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/1.4.5" + }, "funding": [ { "url": "https://packagist.com", @@ -364,26 +502,26 @@ "type": "tidelift" } ], - "time": "2020-08-19T10:27:58+00:00" + "time": "2020-11-13T08:04:11+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.7.0", + "version": "v0.7.1", "source": { "type": "git", "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "e8d808670b8f882188368faaf1144448c169c0b7" + "reference": "fe390591e0241955f22eb9ba327d137e501c771c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e8d808670b8f882188368faaf1144448c169c0b7", - "reference": "e8d808670b8f882188368faaf1144448c169c0b7", + "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c", + "reference": "fe390591e0241955f22eb9ba327d137e501c771c", "shasum": "" }, "require": { "composer-plugin-api": "^1.0 || ^2.0", "php": ">=5.3", - "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev" + "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0" }, "require-dev": { "composer/composer": "*", @@ -430,7 +568,11 @@ "stylecheck", "tests" ], - "time": "2020-06-25T14:57:39+00:00" + "support": { + "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues", + "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer" + }, + "time": "2020-12-07T18:04:37+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -463,40 +605,39 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, "time": "2019-12-04T15:06:13+00:00" }, { "name": "doctrine/instantiator", - "version": "dev-master", + "version": "1.5.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "3e7a22aed197e9333cc929e7f6b4300bdae91fcc" + "reference": "6410c4b8352cb64218641457cef64997e6b784fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/3e7a22aed197e9333cc929e7f6b4300bdae91fcc", - "reference": "3e7a22aed197e9333cc929e7f6b4300bdae91fcc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/6410c4b8352cb64218641457cef64997e6b784fb", + "reference": "6410c4b8352cb64218641457cef64997e6b784fb", "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.4.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -510,7 +651,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", @@ -519,6 +660,10 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.x" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -533,29 +678,29 @@ "type": "tidelift" } ], - "time": "2020-06-15T18:51:04+00:00" + "time": "2020-11-10T19:05:51+00:00" }, { "name": "felixfbecker/advanced-json-rpc", - "version": "v3.1.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40" + "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/0ed363f8de17d284d479ec813c9ad3f6834b5c40", - "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e", + "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e", "shasum": "" }, "require": { "netresearch/jsonmapper": "^1.0 || ^2.0", - "php": ">=7.0", - "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0" + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" }, "require-dev": { - "phpunit/phpunit": "^6.0.0" + "phpunit/phpunit": "^7.0 || ^8.0" }, "type": "library", "autoload": { @@ -574,31 +719,41 @@ } ], "description": "A more advanced JSONRPC implementation", - "time": "2020-03-11T15:21:41+00:00" + "support": { + "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0" + }, + "time": "2021-01-10T17:48:47+00:00" }, { "name": "felixfbecker/language-server-protocol", - "version": "v1.4.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "378801f6139bb74ac215d81cca1272af61df9a9f" + "reference": "85e83cacd2ed573238678c6875f8f0d7ec699541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/378801f6139bb74ac215d81cca1272af61df9a9f", - "reference": "378801f6139bb74ac215d81cca1272af61df9a9f", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/85e83cacd2ed573238678c6875f8f0d7ec699541", + "reference": "85e83cacd2ed573238678c6875f8f0d7ec699541", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.1" }, "require-dev": { "phpstan/phpstan": "*", - "phpunit/phpunit": "^6.3", - "squizlabs/php_codesniffer": "^3.1" + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" }, + "default-branch": true, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { "psr-4": { "LanguageServerProtocol\\": "src/" @@ -621,7 +776,11 @@ "php", "server" ], - "time": "2019-06-23T21:03:50+00:00" + "support": { + "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.0" + }, + "time": "2020-10-23T13:55:30+00:00" }, { "name": "myclabs/deep-copy", @@ -629,12 +788,12 @@ "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "a3409d10079990eeb489c3fead0ac070b5b38895" + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a3409d10079990eeb489c3fead0ac070b5b38895", - "reference": "a3409d10079990eeb489c3fead0ac070b5b38895", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { @@ -648,6 +807,7 @@ "doctrine/common": "^2.6", "phpunit/phpunit": "^7.1" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -669,13 +829,17 @@ "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-08-28T16:31:07+00:00" + "time": "2020-11-13T09:40:50+00:00" }, { "name": "netresearch/jsonmapper", @@ -721,20 +885,25 @@ } ], "description": "Map nested JSON structures onto PHP classes", + "support": { + "email": "cweiske@cweiske.de", + "issues": "https://github.com/cweiske/jsonmapper/issues", + "source": "https://github.com/cweiske/jsonmapper/tree/master" + }, "time": "2020-04-16T18:48:43+00:00" }, { "name": "nikic/php-parser", - "version": "v4.10.2", + "version": "v4.10.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "658f1be311a230e0907f5dfe0213742aff0596de" + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", - "reference": "658f1be311a230e0907f5dfe0213742aff0596de", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", "shasum": "" }, "require": { @@ -773,7 +942,11 @@ "parser", "php" ], - "time": "2020-09-26T10:30:38+00:00" + "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": "openlss/lib-array2xml", @@ -822,6 +995,10 @@ "xml", "xml conversion" ], + "support": { + "issues": "https://github.com/nullivex/lib-array2xml/issues", + "source": "https://github.com/nullivex/lib-array2xml/tree/master" + }, "time": "2019-03-29T20:06:56+00:00" }, { @@ -877,6 +1054,10 @@ } ], "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": "2018-07-08T19:23:20+00:00" }, { @@ -924,25 +1105,32 @@ } ], "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/master" + }, "time": "2018-07-08T19:19:57+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "dev-master", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "cf8df60735d98fd18070b7cab0019ba0831e219c" + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/cf8df60735d98fd18070b7cab0019ba0831e219c", - "reference": "cf8df60735d98fd18070b7cab0019ba0831e219c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", "shasum": "" }, "require": { "php": ">=7.1" }, + "require-dev": { + "phpunit/phpunit": "~6" + }, "type": "library", "extra": { "branch-alias": { @@ -973,31 +1161,34 @@ "reflection", "static analysis" ], - "time": "2020-06-19T17:42:03+00:00" + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.0.0" + }, + "time": "2018-08-07T13:53:10+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "dev-master", + "version": "5.0.0-alpha5", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "8fcadfe5f85c38705151c9ab23b4781f23e6a70e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8fcadfe5f85c38705151c9ab23b4781f23e6a70e", + "reference": "8fcadfe5f85c38705151c9ab23b4781f23e6a70e", "shasum": "" }, "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" + "php": ">=7.1", + "phpdocumentor/type-resolver": "^0", + "webmozart/assert": "^1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "doctrine/instantiator": "^1", + "mockery/mockery": "^1" }, "type": "library", "extra": { @@ -1018,40 +1209,41 @@ { "name": "Mike van Riel", "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" } ], "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-09-03T19:13:55+00:00" + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + }, + "time": "2019-06-15T20:45:01+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.x-dev", + "version": "0.7.x-dev", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" + "reference": "e424cdf9bbab5bccdede5f123f706083b11bcef9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", - "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e424cdf9bbab5bccdede5f123f706083b11bcef9", + "reference": "e424cdf9bbab5bccdede5f123f706083b11bcef9", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "php": ">=7.1", + "phpdocumentor/reflection-common": "~2.0.0-beta1" }, "require-dev": { - "ext-tokenizer": "*" + "mockery/mockery": "~1", + "phpunit/phpunit": "~6" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-master": "0.x-dev" } }, "autoload": { @@ -1070,37 +1262,41 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2020-09-17T18:55:26+00:00" + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/0.7.x" + }, + "time": "2019-12-20T14:34:12+00:00" }, { "name": "phpspec/prophecy", - "version": "1.12.1", + "version": "v1.10.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d" + "reference": "451c3cd1418cf640de218914901e51b064abb093" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d", - "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.2", - "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" + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { - "phpspec/phpspec": "^6.0", - "phpunit/phpunit": "^8.0 || ^9.0 <9.3" + "phpspec/phpspec": "^2.5 || ^3.2", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11.x-dev" + "dev-master": "1.10.x-dev" } }, "autoload": { @@ -1133,35 +1329,36 @@ "spy", "stub" ], - "time": "2020-09-29T09:10:42+00:00" + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/v1.10.3" + }, + "time": "2020-03-05T15:02:03+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "0.4.9", + "version": "0.4.10", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531" + "reference": "5c1eb9aac80cb236f1b7fbe52e691afe4cc9f430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/98a088b17966bdf6ee25c8a4b634df313d8aa531", - "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5c1eb9aac80cb236f1b7fbe52e691afe4cc9f430", + "reference": "5c1eb9aac80cb236f1b7fbe52e691afe4cc9f430", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "consistence/coding-standard": "^3.5", - "ergebnis/composer-normalize": "^2.0.2", - "jakub-onderka/php-parallel-lint": "^0.9.2", - "phing/phing": "^2.16.0", + "phing/phing": "^2.16.3", + "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.26", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^6.3", - "slevomat/coding-standard": "^4.7.2", + "phpstan/phpstan": "^0.12.60", + "phpstan/phpstan-strict-rules": "^0.12.5", + "phpunit/phpunit": "^7.5.20", "symfony/process": "^4.0" }, "type": "library", @@ -1182,44 +1379,48 @@ "MIT" ], "description": "PHPDoc parser with support for nullable, intersection and generic types", - "time": "2020-08-03T20:32:43+00:00" + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/0.4.10" + }, + "time": "2020-12-12T15:45:28+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.10", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf", - "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.2", - "phpunit/php-file-iterator": "^2.0.2", + "php": "^7.1", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.1", + "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" + "theseer/tokenizer": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^8.2.2" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-xdebug": "^2.7.2" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -1245,27 +1446,31 @@ "testing", "xunit" ], - "time": "2019-11-20T13:55:58+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master" + }, + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.2", + "version": "2.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "050bedf145a257b1ff02746c31894800e5122946" + "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357" }, "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/4b49fb70f067272b659ef0174ff9ca40fdaa6357", + "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { @@ -1295,7 +1500,17 @@ "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/2.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:25:21+00:00" }, { "name": "phpunit/php-text-template", @@ -1336,27 +1551,31 @@ "keywords": [ "template" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + }, "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", - "version": "2.1.2", + "version": "2.1.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", - "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { @@ -1385,7 +1604,17 @@ "keywords": [ "timer" ], - "time": "2019-06-07T04:22:29+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:20:02+00:00" }, { "name": "phpunit/php-token-stream", @@ -1393,17 +1622,17 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff" + "reference": "472b687829041c24b25f475e14c2f38a09edf1c2" }, "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-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2", + "reference": "472b687829041c24b25f475e14c2f38a09edf1c2", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^7.0" @@ -1434,57 +1663,68 @@ "keywords": [ "tokenizer" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "abandoned": true, - "time": "2019-09-17T06:23:10+00:00" + "time": "2020-11-30T08:38:46+00:00" }, { "name": "phpunit/phpunit", - "version": "8.5.x-dev", + "version": "7.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "684ef7b7ef6ba3c289113dba7fef53d1ba7d8cda" + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/684ef7b7ef6ba3c289113dba7fef53d1ba7d8cda", - "reference": "684ef7b7ef6ba3c289113dba7fef53d1ba7d8cda", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", - "phar-io/manifest": "^1.0.3", - "phar-io/version": "^2.0.1", - "php": "^7.2", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.10", - "phpunit/php-file-iterator": "^2.0.2", + "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.2", - "sebastian/comparator": "^3.0.2", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", + "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.1", - "sebastian/type": "^1.1.3", + "sebastian/resource-operations": "^2.0", "sebastian/version": "^2.0.1" }, + "conflict": { + "phpunit/phpunit-mock-objects": "*" + }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-soap": "*", "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0.0" + "phpunit/php-invoker": "^2.0" }, "bin": [ "phpunit" @@ -1492,7 +1732,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.5-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -1518,66 +1758,11 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T04:52:07+00:00" - }, - { - "name": "psr/container", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b1fbdff230c2fae8b3e600ead18e711563f05a04" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b1fbdff230c2fae8b3e600ead18e711563f05a04", - "reference": "b1fbdff230c2fae8b3e600ead18e711563f05a04", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.20" }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2020-09-18T06:44:01+00:00" + "time": "2020-01-08T08:45:45+00:00" }, { "name": "psr/log", @@ -1596,6 +1781,7 @@ "require": { "php": ">=5.3.0" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -1624,27 +1810,30 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/master" + }, "time": "2020-09-18T06:44:51+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.1", + "version": "1.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" }, "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/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { @@ -1669,29 +1858,39 @@ ], "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/1.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.2", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", - "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", "shasum": "" }, "require": { - "php": "^7.1", + "php": ">=7.1", "sebastian/diff": "^3.0", "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { @@ -1709,6 +1908,10 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -1720,10 +1923,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", @@ -1733,24 +1932,34 @@ "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/3.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:04:30+00:00" }, { "name": "sebastian/diff", - "version": "3.0.2", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", - "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^7.5 || ^8.0", @@ -1772,13 +1981,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", @@ -1789,24 +1998,34 @@ "unidiff", "unified diff" ], - "time": "2019-02-04T06:01:07+00:00" - }, - { - "name": "sebastian/environment", - "version": "4.2.3", - "source": { + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/3.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:59:04+00:00" + }, + { + "name": "sebastian/environment", + "version": "4.2.x-dev", + "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368" + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368", - "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^7.5" @@ -1842,24 +2061,34 @@ "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/4.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:53:42+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.2", + "version": "3.1.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e" + "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", + "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", "shasum": "" }, "require": { - "php": "^7.0", + "php": ">=7.0", "sebastian/recursion-context": "^3.0" }, "require-dev": { @@ -1909,30 +2138,37 @@ "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/3.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:47:53+00:00" }, { "name": "sebastian/global-state", - "version": "3.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", - "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": "^7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": "^7.0" }, "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -1940,7 +2176,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1963,24 +2199,28 @@ "keywords": [ "global state" ], - "time": "2019-02-01T05:30:01+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0" + }, + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.3", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" }, "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/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", "shasum": "" }, "require": { - "php": "^7.0", + "php": ">=7.0", "sebastian/object-reflector": "^1.1.1", "sebastian/recursion-context": "^3.0" }, @@ -2010,24 +2250,34 @@ ], "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/3.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:40:27+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.1", + "version": "1.1.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "773f97c67f28de00d397be301821b06708fca0be" + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" }, "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/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.0" }, "require-dev": { "phpunit/phpunit": "^6.0" @@ -2055,24 +2305,34 @@ ], "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/1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:37:18+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.0", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" }, "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/367dcba38d6e1977be014dc4b22f47a484dac7fb", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.0" }, "require-dev": { "phpunit/phpunit": "^6.0" @@ -2093,14 +2353,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" @@ -2108,24 +2368,34 @@ ], "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/3.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:34:24+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.1", + "version": "2.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" }, "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/31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=7.1" }, "type": "library", "extra": { @@ -2150,53 +2420,17 @@ ], "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" - }, - { - "name": "sebastian/type", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3", - "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3", - "shasum": "" - }, - "require": { - "php": "^7.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0" }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ + "funding": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "url": "https://github.com/sebastianbergmann", + "type": "github" } ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", - "time": "2019-07-02T08:10:15+00:00" + "time": "2020-11-30T07:30:19+00:00" }, { "name": "sebastian/version", @@ -2239,6 +2473,10 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/master" + }, "time": "2016-10-03T07:35:21+00:00" }, { @@ -2247,29 +2485,30 @@ "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "740684135cf9729849c2516049a61696f8fdd3ae" + "reference": "e07e2d15211ca4e7c972b276f5bf7ce2c07cfca0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/740684135cf9729849c2516049a61696f8fdd3ae", - "reference": "740684135cf9729849c2516049a61696f8fdd3ae", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/e07e2d15211ca4e7c972b276f5bf7ce2c07cfca0", + "reference": "e07e2d15211ca4e7c972b276f5bf7ce2c07cfca0", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.1 || ^8.0", - "phpstan/phpdoc-parser": "0.4.5 - 0.4.9", - "squizlabs/php_codesniffer": "^3.5.6" + "phpstan/phpdoc-parser": "0.4.5 - 0.4.10", + "squizlabs/php_codesniffer": "dev-master" }, "require-dev": { "phing/phing": "2.16.3", "php-parallel-lint/php-parallel-lint": "1.2.0", - "phpstan/phpstan": "0.12.40", - "phpstan/phpstan-deprecation-rules": "0.12.5", - "phpstan/phpstan-phpunit": "0.12.16", - "phpstan/phpstan-strict-rules": "0.12.5", - "phpunit/phpunit": "7.5.20|8.5.5|9.3.8" + "phpstan/phpstan": "0.12.64", + "phpstan/phpstan-deprecation-rules": "0.12.6", + "phpstan/phpstan-phpunit": "0.12.17", + "phpstan/phpstan-strict-rules": "0.12.7", + "phpunit/phpunit": "7.5.20|8.5.5|9.5.0" }, + "default-branch": true, "type": "phpcodesniffer-standard", "extra": { "branch-alias": { @@ -2286,6 +2525,10 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", + "support": { + "issues": "https://github.com/slevomat/coding-standard/issues", + "source": "https://github.com/slevomat/coding-standard/tree/master" + }, "funding": [ { "url": "https://github.com/kukulich", @@ -2296,7 +2539,7 @@ "type": "tidelift" } ], - "time": "2020-09-18T12:01:20+00:00" + "time": "2021-01-11T10:34:02+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -2304,12 +2547,12 @@ "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "afca5acf1fa35f69e8ac6118a6be56aec757534f" + "reference": "9bcb29cce831a8f9b2c8aee0bba1a57445f9dbf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/afca5acf1fa35f69e8ac6118a6be56aec757534f", - "reference": "afca5acf1fa35f69e8ac6118a6be56aec757534f", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9bcb29cce831a8f9b2c8aee0bba1a57445f9dbf1", + "reference": "9bcb29cce831a8f9b2c8aee0bba1a57445f9dbf1", "shasum": "" }, "require": { @@ -2321,6 +2564,7 @@ "require-dev": { "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, + "default-branch": true, "bin": [ "bin/phpcs", "bin/phpcbf" @@ -2347,48 +2591,51 @@ "phpcs", "standards" ], - "time": "2020-09-29T07:29:53+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-12-15T02:38:00+00:00" }, { "name": "symfony/console", - "version": "dev-master", + "version": "4.4.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "671cd6883a6da303a19f22a79bf4d4ea911b9cfc" + "reference": "096c4d37e79f70bbac78424468b19878f96e987f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/671cd6883a6da303a19f22a79bf4d4ea911b9cfc", - "reference": "671cd6883a6da303a19f22a79bf4d4ea911b9cfc", + "url": "https://api.github.com/repos/symfony/console/zipball/096c4d37e79f70bbac78424468b19878f96e987f", + "reference": "096c4d37e79f70bbac78424468b19878f96e987f", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/service-contracts": "^1.1|^2" }, "conflict": { - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", + "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3|>=5", "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/process": "<3.3" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -2397,11 +2644,6 @@ "symfony/process": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.2-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" @@ -2424,14 +2666,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Console Component", + "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", - "keywords": [ - "cli", - "command line", - "console", - "terminal" - ], + "support": { + "source": "https://github.com/symfony/console/tree/4.4" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2446,32 +2685,33 @@ "type": "tidelift" } ], - "time": "2020-09-30T05:13:00+00:00" + "time": "2021-01-11T08:57:50+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "dev-master", + "version": "dev-main", "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" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2508,165 +2748,9 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-07-14T12:35:20+00:00" - }, - { - "name": "symfony/polyfill-intl-grapheme", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5", - "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's grapheme_* functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-07-14T12:35:20+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], "funding": [ { "url": "https://symfony.com/sponsor", @@ -2681,32 +2765,33 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "48928d471ede0548b399f54b0286fe0d0ed79267" + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/48928d471ede0548b399f54b0286fe0d0ed79267", - "reference": "48928d471ede0548b399f54b0286fe0d0ed79267", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-mbstring": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2744,6 +2829,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2758,29 +2846,30 @@ "type": "tidelift" } ], - "time": "2020-09-14T11:01:58+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca" + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca", - "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2820,6 +2909,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2834,29 +2926,30 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php80", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "c3616e7b303d0bd8c261de7921c72bf818b52b91" + "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/c3616e7b303d0bd8c261de7921c72bf818b52b91", - "reference": "c3616e7b303d0bd8c261de7921c72bf818b52b91", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", + "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", "shasum": "" }, "require": { - "php": ">=7.0.8" + "php": ">=7.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2900,6 +2993,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2914,24 +3010,24 @@ "type": "tidelift" } ], - "time": "2020-09-14T10:02:33+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/service-contracts", - "version": "dev-master", + "version": "v1.1.9", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "90388a3609590fd1404b37334fa64a95ed1c34de" + "reference": "b776d18b303a39f56c63747bcb977ad4b27aca26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/90388a3609590fd1404b37334fa64a95ed1c34de", - "reference": "90388a3609590fd1404b37334fa64a95ed1c34de", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b776d18b303a39f56c63747bcb977ad4b27aca26", + "reference": "b776d18b303a39f56c63747bcb977ad4b27aca26", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=7.1.3", "psr/container": "^1.0" }, "suggest": { @@ -2940,7 +3036,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "1.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -2976,91 +3072,9 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-09-29T22:43:35+00:00" - }, - { - "name": "symfony/string", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "4dfc0b23e58ae0060af6bf72af6e80c557848386" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4dfc0b23e58ae0060af6bf72af6e80c557848386", - "reference": "4dfc0b23e58ae0060af6bf72af6e80c557848386", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" - }, - "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v1.1.9" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, - "files": [ - "Resources/functions.php" - ], - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony String component", - "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], "funding": [ { "url": "https://symfony.com/sponsor", @@ -3075,27 +3089,27 @@ "type": "tidelift" } ], - "time": "2020-09-24T09:57:23+00:00" + "time": "2020-07-06T13:19:58+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.0", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "75a63c33a8577608444246075ea0af0d052e452a" + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", - "reference": "75a63c33a8577608444246075ea0af0d052e452a", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" + "php": "^7.0" }, "type": "library", "autoload": { @@ -3115,13 +3129,11 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], - "time": "2020-07-12T23:59:07+00:00" + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/master" + }, + "time": "2019-06-13T22:48:21+00:00" }, { "name": "vimeo/psalm", @@ -3129,12 +3141,12 @@ "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "d03e5ef057d6adc656c0ff7e166c50b73b4f48f3" + "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/d03e5ef057d6adc656c0ff7e166c50b73b4f48f3", - "reference": "d03e5ef057d6adc656c0ff7e166c50b73b4f48f3", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/19aa905f7c3c7350569999a93c40ae91ae4e1626", + "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626", "shasum": "" }, "require": { @@ -3221,7 +3233,11 @@ "inspection", "php" ], - "time": "2020-09-15T13:39:50+00:00" + "support": { + "issues": "https://github.com/vimeo/psalm/issues", + "source": "https://github.com/vimeo/psalm/tree/3.x" + }, + "time": "2020-10-20T13:48:22+00:00" }, { "name": "webmozart/assert", @@ -3270,6 +3286,10 @@ "check", "validate" ], + "support": { + "issues": "https://github.com/webmozart/assert/issues", + "source": "https://github.com/webmozart/assert/tree/master" + }, "time": "2020-07-08T17:02:28+00:00" }, { @@ -3295,6 +3315,7 @@ "sebastian/version": "^1.0.1", "symfony/filesystem": "^2.5" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3317,6 +3338,10 @@ } ], "description": "A PHP implementation of Ant's glob.", + "support": { + "issues": "https://github.com/webmozart/glob/issues", + "source": "https://github.com/webmozart/glob/tree/master" + }, "time": "2016-08-15T15:31:26+00:00" }, { @@ -3341,6 +3366,7 @@ "phpunit/phpunit": "^4.6", "sebastian/version": "^1.0.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3363,6 +3389,10 @@ } ], "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", + "support": { + "issues": "https://github.com/webmozart/path-util/issues", + "source": "https://github.com/webmozart/path-util/tree/master" + }, "time": "2016-08-15T15:31:42+00:00" } ], @@ -3372,8 +3402,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.2" + "php": "^7.1" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } diff --git a/src/.gitkeep b/src/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/QueryInterface.php b/src/QueryInterface.php new file mode 100644 index 0000000..d0fe81d --- /dev/null +++ b/src/QueryInterface.php @@ -0,0 +1,51 @@ + $params The map of param names to values. + * @return self A new instance of this class, with only the specified params. + */ + public function withParams(array $params = []): QueryInterface; + + /** + * Creates a new query without the specified params. + * + * @param list $params The list of names for params to remove. + * @return self A new instance of this class, without the specified params. + */ + public function withoutParams(array $params): QueryInterface; +} diff --git a/src/StringQueryFactoryInterface.php b/src/StringQueryFactoryInterface.php new file mode 100644 index 0000000..a2489d9 --- /dev/null +++ b/src/StringQueryFactoryInterface.php @@ -0,0 +1,25 @@ + Date: Tue, 12 Jan 2021 08:40:54 +0100 Subject: [PATCH 02/15] Correct branch name in alias --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index d52096f..f7cfb72 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "extra": { "branch-alias": { - "dev-initial": "0.1.x-dev" + "dev-task/initial": "0.1.x-dev" } } } diff --git a/composer.lock b/composer.lock index b6bbf84..4ea541e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "88ccebbf33001c8342bf7f35e0839984", + "content-hash": "40099317a8b46a3431cf7eb05ffa51c3", "packages": [ { "name": "dhii/collections-interface", @@ -123,23 +123,23 @@ "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9" + "reference": "973878a03840043019bc535c840a480223ee761f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9", - "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9", + "url": "https://api.github.com/repos/amphp/amp/zipball/973878a03840043019bc535c840a480223ee761f", + "reference": "973878a03840043019bc535c840a480223ee761f", "shasum": "" }, "require": { - "php": ">=7" + "php": ">=7.1" }, "require-dev": { "amphp/php-cs-fixer-config": "dev-master", "amphp/phpunit-util": "^1", "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^6.0.9 | ^7", + "phpunit/phpunit": "^7 | ^8 | ^9", "psalm/phar": "^3.11@dev", "react/promise": "^2" }, @@ -197,7 +197,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.5.2" + "source": "https://github.com/amphp/amp/tree/master" }, "funding": [ { @@ -205,7 +205,7 @@ "type": "github" } ], - "time": "2021-01-10T17:06:37+00:00" + "time": "2021-01-11T22:57:20+00:00" }, { "name": "amphp/byte-stream", From 8cf0b81339dbd5a53b3f3edcbb1a8b1356f47d3e Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Fri, 15 Jan 2021 09:41:34 +0100 Subject: [PATCH 03/15] Set line endings to LF --- .gitattributes | 2 ++ .idea/codestream.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index c28893e..d926058 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,3 +14,5 @@ composer.lock export-ignore phpunit.xml export-ignore phpunit.xml.dist export-ignore docker export-ignore + +* text eol=lf diff --git a/.idea/codestream.xml b/.idea/codestream.xml index 7aea05a..d787f19 100644 --- a/.idea/codestream.xml +++ b/.idea/codestream.xml @@ -1,6 +1,6 @@ - \ No newline at end of file From 9998930b9f05e823958a0d4795775cbe28110f8f Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 17:44:55 +0100 Subject: [PATCH 04/15] Allow PHP 8 and Psalm 4 --- composer.json | 4 +- composer.lock | 141 ++++++++++++++++---------------------------------- 2 files changed, 47 insertions(+), 98 deletions(-) diff --git a/composer.json b/composer.json index f7cfb72..d4d516e 100644 --- a/composer.json +++ b/composer.json @@ -11,12 +11,12 @@ } ], "require": { - "php": "^7.1", + "php": "^7.1 | ^8.0", "dhii/collections-interface": "^v0.3.0-alpha1" }, "require-dev": { "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", - "vimeo/psalm": "^3.11.7", + "vimeo/psalm": "^3.11.7 | ^4.0", "slevomat/coding-standard": "^6.0", "symfony/polyfill-php80": "^1.19" }, diff --git a/composer.lock b/composer.lock index 4ea541e..0443e4c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "40099317a8b46a3431cf7eb05ffa51c3", + "content-hash": "155570c6fb81d0c8a95965a4719875b9", "packages": [ { "name": "dhii/collections-interface", @@ -12,22 +12,22 @@ "source": { "type": "git", "url": "https://github.com/Dhii/collections-interface.git", - "reference": "0fa5a14c407995cb0b9634ee42f127a91f24aafc" + "reference": "7c7c4b4459dda9e6db406860d99916d0cee58ccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/0fa5a14c407995cb0b9634ee42f127a91f24aafc", - "reference": "0fa5a14c407995cb0b9634ee42f127a91f24aafc", + "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/7c7c4b4459dda9e6db406860d99916d0cee58ccf", + "reference": "7c7c4b4459dda9e6db406860d99916d0cee58ccf", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^7.1 | ^8.0", "psr/container": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^7.0 | ^8.0", + "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", "slevomat/coding-standard": "^6.0", - "vimeo/psalm": "^3.0" + "vimeo/psalm": "^3.11.7 | ^4.0" }, "default-branch": true, "type": "library", @@ -58,9 +58,9 @@ "description": "A highly ISP-compliant collection of interfaces that represent maps and lists.", "support": { "issues": "https://github.com/Dhii/collections-interface/issues", - "source": "https://github.com/Dhii/collections-interface/tree/v0.3.0-alpha2" + "source": "https://github.com/Dhii/collections-interface/tree/v0.3.0-alpha3" }, - "time": "2020-10-13T08:27:37+00:00" + "time": "2021-01-14T17:33:46+00:00" }, { "name": "psr/container", @@ -123,12 +123,12 @@ "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "973878a03840043019bc535c840a480223ee761f" + "reference": "7d4bbc6e0b47c6bb39b6cce1a4b5942e0c5125fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/973878a03840043019bc535c840a480223ee761f", - "reference": "973878a03840043019bc535c840a480223ee761f", + "url": "https://api.github.com/repos/amphp/amp/zipball/7d4bbc6e0b47c6bb39b6cce1a4b5942e0c5125fb", + "reference": "7d4bbc6e0b47c6bb39b6cce1a4b5942e0c5125fb", "shasum": "" }, "require": { @@ -205,7 +205,7 @@ "type": "github" } ], - "time": "2021-01-11T22:57:20+00:00" + "time": "2021-01-13T19:16:50+00:00" }, { "name": "amphp/byte-stream", @@ -2485,12 +2485,12 @@ "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "e07e2d15211ca4e7c972b276f5bf7ce2c07cfca0" + "reference": "aa803a98f55dbd28dcacab70d8cd58a1090f693c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/e07e2d15211ca4e7c972b276f5bf7ce2c07cfca0", - "reference": "e07e2d15211ca4e7c972b276f5bf7ce2c07cfca0", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aa803a98f55dbd28dcacab70d8cd58a1090f693c", + "reference": "aa803a98f55dbd28dcacab70d8cd58a1090f693c", "shasum": "" }, "require": { @@ -2502,10 +2502,10 @@ "require-dev": { "phing/phing": "2.16.3", "php-parallel-lint/php-parallel-lint": "1.2.0", - "phpstan/phpstan": "0.12.64", + "phpstan/phpstan": "0.12.66", "phpstan/phpstan-deprecation-rules": "0.12.6", "phpstan/phpstan-phpunit": "0.12.17", - "phpstan/phpstan-strict-rules": "0.12.7", + "phpstan/phpstan-strict-rules": "0.12.9", "phpunit/phpunit": "7.5.20|8.5.5|9.5.0" }, "default-branch": true, @@ -2539,7 +2539,7 @@ "type": "tidelift" } ], - "time": "2021-01-11T10:34:02+00:00" + "time": "2021-01-17T08:09:06+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -2547,12 +2547,12 @@ "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "9bcb29cce831a8f9b2c8aee0bba1a57445f9dbf1" + "reference": "0aeb095248f307cc7bac7b0268ae4d5d3440f300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9bcb29cce831a8f9b2c8aee0bba1a57445f9dbf1", - "reference": "9bcb29cce831a8f9b2c8aee0bba1a57445f9dbf1", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0aeb095248f307cc7bac7b0268ae4d5d3440f300", + "reference": "0aeb095248f307cc7bac7b0268ae4d5d3440f300", "shasum": "" }, "require": { @@ -2596,7 +2596,7 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2020-12-15T02:38:00+00:00" + "time": "2021-01-14T23:47:51+00:00" }, { "name": "symfony/console", @@ -2604,12 +2604,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "096c4d37e79f70bbac78424468b19878f96e987f" + "reference": "adb658b43abb668be457c1adb0e472c842dea6af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/096c4d37e79f70bbac78424468b19878f96e987f", - "reference": "096c4d37e79f70bbac78424468b19878f96e987f", + "url": "https://api.github.com/repos/symfony/console/zipball/adb658b43abb668be457c1adb0e472c842dea6af", + "reference": "adb658b43abb668be457c1adb0e472c842dea6af", "shasum": "" }, "require": { @@ -2685,7 +2685,7 @@ "type": "tidelift" } ], - "time": "2021-01-11T08:57:50+00:00" + "time": "2021-01-14T15:08:15+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3137,16 +3137,16 @@ }, { "name": "vimeo/psalm", - "version": "3.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626" + "reference": "fdb181fe00872af0e2a5cc1aa2d95e62b19729ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/19aa905f7c3c7350569999a93c40ae91ae4e1626", - "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/fdb181fe00872af0e2a5cc1aa2d95e62b19729ae", + "reference": "fdb181fe00872af0e2a5cc1aa2d95e62b19729ae", "shasum": "" }, "require": { @@ -3165,12 +3165,11 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.4", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0", - "nikic/php-parser": "4.3.* || 4.4.* || 4.5.* || 4.6.* || ^4.8", + "nikic/php-parser": "^4.10.1", "openlss/lib-array2xml": "^1.0", - "php": "^7.1.3|^8", + "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", - "webmozart/glob": "^4.1", "webmozart/path-util": "^2.3" }, "provide": { @@ -3179,14 +3178,14 @@ "require-dev": { "amphp/amp": "^2.4.2", "bamarni/composer-bin-plugin": "^1.2", - "brianium/paratest": "^4.0.0", + "brianium/paratest": "^4.0||^6.0", "ext-curl": "*", - "phpdocumentor/reflection-docblock": "^4.3.4 || ^5", - "phpmyadmin/sql-parser": "5.1.0", + "phpdocumentor/reflection-docblock": "^5", + "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", - "phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0", - "psalm/plugin-phpunit": "^0.11", - "slevomat/coding-standard": "^5.0", + "phpunit/phpunit": "^9.0", + "psalm/plugin-phpunit": "^0.13", + "slevomat/coding-standard": "^6.3.11", "squizlabs/php_codesniffer": "^3.5", "symfony/process": "^4.3", "weirdan/prophecy-shim": "^1.0 || ^2.0" @@ -3194,6 +3193,7 @@ "suggest": { "ext-igbinary": "^2.0.5" }, + "default-branch": true, "bin": [ "psalm", "psalm-language-server", @@ -3204,7 +3204,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev", + "dev-master": "4.x-dev", + "dev-3.x": "3.x-dev", "dev-2.x": "2.x-dev", "dev-1.x": "1.x-dev" } @@ -3235,9 +3236,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/3.x" + "source": "https://github.com/vimeo/psalm/tree/master" }, - "time": "2020-10-20T13:48:22+00:00" + "time": "2021-01-17T15:56:24+00:00" }, { "name": "webmozart/assert", @@ -3292,58 +3293,6 @@ }, "time": "2020-07-08T17:02:28+00:00" }, - { - "name": "webmozart/glob", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/webmozart/glob.git", - "reference": "8da14867b709e8776d9f6272faaf844aefc695e3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/glob/zipball/8da14867b709e8776d9f6272faaf844aefc695e3", - "reference": "8da14867b709e8776d9f6272faaf844aefc695e3", - "shasum": "" - }, - "require": { - "php": "^5.3.3|^7.0", - "webmozart/path-util": "^2.2" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1", - "symfony/filesystem": "^2.5" - }, - "default-branch": true, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.1-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Glob\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "A PHP implementation of Ant's glob.", - "support": { - "issues": "https://github.com/webmozart/glob/issues", - "source": "https://github.com/webmozart/glob/tree/master" - }, - "time": "2016-08-15T15:31:26+00:00" - }, { "name": "webmozart/path-util", "version": "dev-master", @@ -3402,7 +3351,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.1" + "php": "^7.1 | ^8.0" }, "platform-dev": [], "plugin-api-version": "2.0.0" From c64d21328a47fab460c11ee4879c3d8a3569a4e6 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 17:46:25 +0100 Subject: [PATCH 05/15] Build also on PHP 8.0 and 7.1 --- .github/workflows/continuous-integration.yml | 2 +- .idea/php.xml | 1 - .idea/query-interface.iml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a5e5aaf..eecf7e9 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.2', '7.3', '7.4'] + php-versions: ['7.1', '7.2', '7.3', '7.4', '8.1'] steps: - uses: actions/checkout@v2 diff --git a/.idea/php.xml b/.idea/php.xml index 4c163c6..9b47abb 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -51,7 +51,6 @@ - diff --git a/.idea/query-interface.iml b/.idea/query-interface.iml index 66b6c6b..d205947 100644 --- a/.idea/query-interface.iml +++ b/.idea/query-interface.iml @@ -54,7 +54,6 @@ - From 27fb892c548a72a8aead1984d96c9ee8192fbe7b Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 17:46:43 +0100 Subject: [PATCH 06/15] Composer now updates on CI --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index eecf7e9..e8c6f85 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,7 +22,7 @@ jobs: run: composer validate - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest + run: composer update --prefer-dist --no-progress --no-suggest - name: PhpUnit run: ./vendor/bin/phpunit From 934e8d943846b1749074bb8a0f0f04574c21b366 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 17:47:22 +0100 Subject: [PATCH 07/15] Correct PHP 8 version --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e8c6f85..e7f9452 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.1', '7.2', '7.3', '7.4', '8.1'] + php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0'] steps: - uses: actions/checkout@v2 From 263cdb59c2995e3638307e11b38175fe9b45d36c Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 18:05:26 +0100 Subject: [PATCH 08/15] Add tests --- .idea/php-test-framework.xml | 2 +- .idea/php.xml | 3 +- .idea/query-interface.iml | 3 +- composer.json | 2 +- phpunit.xml.dist | 5 +-- tests/functional/ThingTest.php | 14 -------- tests/unit/QueryInterfaceTest.php | 34 +++++++++++++++++++ .../unit/StringQueryFactoryInterfaceTest.php | 34 +++++++++++++++++++ 8 files changed, 74 insertions(+), 23 deletions(-) delete mode 100644 tests/functional/ThingTest.php create mode 100644 tests/unit/QueryInterfaceTest.php create mode 100644 tests/unit/StringQueryFactoryInterfaceTest.php diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml index 49faf66..e16fe3a 100644 --- a/.idea/php-test-framework.xml +++ b/.idea/php-test-framework.xml @@ -5,7 +5,7 @@ - + diff --git a/.idea/php.xml b/.idea/php.xml index 9b47abb..6aea5f9 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -182,8 +182,7 @@ - - + \ No newline at end of file diff --git a/.idea/query-interface.iml b/.idea/query-interface.iml index d205947..294830b 100644 --- a/.idea/query-interface.iml +++ b/.idea/query-interface.iml @@ -2,9 +2,10 @@ - + + diff --git a/composer.json b/composer.json index d4d516e..7db2c97 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "autoload-dev": { "psr-4": { - "Dhii\\Query\\Test\\": "tests" + "Dhii\\Query\\Test\\Unit\\": "tests/unit" } }, "extra": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0017811..28adb71 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,10 +9,7 @@ - ./tests/unit/ - - - ./tests/functional/ + tests/unit diff --git a/tests/functional/ThingTest.php b/tests/functional/ThingTest.php deleted file mode 100644 index 1a61fdd..0000000 --- a/tests/functional/ThingTest.php +++ /dev/null @@ -1,14 +0,0 @@ -assertTrue(false); - } -} diff --git a/tests/unit/QueryInterfaceTest.php b/tests/unit/QueryInterfaceTest.php new file mode 100644 index 0000000..09bb4b1 --- /dev/null +++ b/tests/unit/QueryInterfaceTest.php @@ -0,0 +1,34 @@ +getMockBuilder(Subject::class) + ->getMockForAbstractClass(); + + return $mock; + } + + public function testCanCreateInstance() + { + { + $subject = $this->createSubject(); + } + + { + $this->assertInstanceOf(Subject::class, $subject); + } + } +} diff --git a/tests/unit/StringQueryFactoryInterfaceTest.php b/tests/unit/StringQueryFactoryInterfaceTest.php new file mode 100644 index 0000000..5dd3d5a --- /dev/null +++ b/tests/unit/StringQueryFactoryInterfaceTest.php @@ -0,0 +1,34 @@ +getMockBuilder(Subject::class) + ->getMockForAbstractClass(); + + return $mock; + } + + public function testCanCreateInstance() + { + { + $subject = $this->createSubject(); + } + + { + $this->assertInstanceOf(Subject::class, $subject); + } + } +} From a9a38d82550afee4472d9920db7e9d5738f36277 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 18:10:59 +0100 Subject: [PATCH 09/15] Remove discontinued Psalm flag from CI config --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e7f9452..a9d745e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -28,7 +28,7 @@ jobs: run: ./vendor/bin/phpunit - name: Psalm - run: ./vendor/bin/psalm --show-info=false --threads=8 --diff --diff-methods + run: ./vendor/bin/psalm --show-info=false --threads=8 --diff - name: PHPCS run: ./vendor/bin/phpcs -s --report-source --runtime-set ignore_warnings_on_exit 1 From 6b5f658e7c1a5116e50b4c7f73b73f8ac912af0b Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 18:14:43 +0100 Subject: [PATCH 10/15] Remove redundant config from Psalm --- psalm.xml.dist | 8 -------- 1 file changed, 8 deletions(-) diff --git a/psalm.xml.dist b/psalm.xml.dist index 51ea1ff..40bf9a7 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -8,8 +8,6 @@ useDocblockTypes="true" usePhpDocMethodsWithoutMagicCall="false" strictBinaryOperands="true" - requireVoidReturnType="true" - useAssertForType="false" rememberPropertyAssignmentsAfterCall="true" allowPhpStormGenerics="true" allowCoercionFromStringToClassConst="false" @@ -27,17 +25,12 @@ > - - - - - @@ -91,7 +84,6 @@ - From 054809a8a9b3a36870cce76afeb04afbc7d907da Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 18:29:34 +0100 Subject: [PATCH 11/15] Fix PHPCS It appears to not be seeing the more complex Psalm type docs. So just ignoring locally. --- phpcs.xml.dist | 4 +++- src/QueryInterface.php | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 44d9489..874fefc 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,7 +9,9 @@ - + + warning + warning diff --git a/src/QueryInterface.php b/src/QueryInterface.php index d0fe81d..8039307 100644 --- a/src/QueryInterface.php +++ b/src/QueryInterface.php @@ -28,6 +28,7 @@ public function getResults(): iterable; * Creates a new query with the specified param. * * @param string $name The name of the parameter. + * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint * @param ?scalar|Stringable $value The value of the parameter * @return self A new instance of this class, with the specified param added. */ @@ -36,6 +37,7 @@ public function withParam(string $name, $value): QueryInterface; /** * Creates a new query with only the specified params. * + * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification * @param array $params The map of param names to values. * @return self A new instance of this class, with only the specified params. */ From 221b599304698df12101549d415ffb3a573b0179 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 19:48:04 +0100 Subject: [PATCH 12/15] Add docs --- README.md | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 88ecb71..3062581 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,43 @@ A light query abstraction standard. ## Details -Abstract querying to a SOLID, immutable layer. +This standard allows the abstraction of querying to a SOLID, immutable layer. This layer +provides a CQRS model that represents a parameterized query, and a factory of such models. +The model supports prepared statements, if they are supported by the DB driver. It also +supports query parameter interpolation. This is inspired by [PDO][], and the realization +that this can easily be normalized to an interop interface. + +## Examples + +### Creat and Run Parameterized Query +```php +query("SELECT * FROM `perons` WHERE `dob` <= :maxDob AND `dob` >= :minDob "); + +function getMillenialNames (QueryInterface $query): iterable { + $results = $query->withParams([ + 'maxDob' => '1999-12-31', + 'minDob' => '1980-01-01', + ])->getResults(); + + foreach ($results as $row) { + yield $row->get('name'); + } +} + +// A list of people who fall into the Millenials category +$millenialNames = getMillenialNames($query); +``` + +## Implementations + +- [`dhii/pdo-query`][] - An implementation that uses [PDO][]. Supports prepared statements +and DB-backed parameter interpolation. + + +[`dhii/pdo-query`]: https://github.com/Dhii/pdo-query +[PDO]: https://www.php.net/manual/en/book.pdo.php From db9e2fb6f77d18ffd161a603cc397355ebb5f669 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 19:54:38 +0100 Subject: [PATCH 13/15] Improve docs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3062581..59d5141 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ A light query abstraction standard. ## Details -This standard allows the abstraction of querying to a SOLID, immutable layer. This layer -provides a CQRS model that represents a parameterized query, and a factory of such models. +This abstracts querying to a SOLID, immutable layer, allowing for easy switching of implementation. +This layer provides a CQRS model that represents a parameterized query, and a factory of such models. The model supports prepared statements, if they are supported by the DB driver. It also supports query parameter interpolation. This is inspired by [PDO][], and the realization that this can easily be normalized to an interop interface. From 8b29858e3e9e37db6ee8f6ab86d203272320188f Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sun, 17 Jan 2021 19:59:51 +0100 Subject: [PATCH 14/15] Remove redundant methods from `QueryInterface` --- src/QueryInterface.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/QueryInterface.php b/src/QueryInterface.php index 8039307..c76c11e 100644 --- a/src/QueryInterface.php +++ b/src/QueryInterface.php @@ -24,16 +24,6 @@ interface QueryInterface */ public function getResults(): iterable; - /** - * Creates a new query with the specified param. - * - * @param string $name The name of the parameter. - * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint - * @param ?scalar|Stringable $value The value of the parameter - * @return self A new instance of this class, with the specified param added. - */ - public function withParam(string $name, $value): QueryInterface; - /** * Creates a new query with only the specified params. * @@ -42,12 +32,4 @@ public function withParam(string $name, $value): QueryInterface; * @return self A new instance of this class, with only the specified params. */ public function withParams(array $params = []): QueryInterface; - - /** - * Creates a new query without the specified params. - * - * @param list $params The list of names for params to remove. - * @return self A new instance of this class, without the specified params. - */ - public function withoutParams(array $params): QueryInterface; } From 893274b14117c36b33c81a2a80dae8a148475100 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 18 Jan 2021 12:41:48 +0100 Subject: [PATCH 15/15] Improve example. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59d5141..26849d8 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,10 @@ that this can easily be normalized to an interop interface. ## Examples ### Creat and Run Parameterized Query + ```php getResults(); foreach ($results as $row) { + assert($row instanceof CountableMapInterface); yield $row->get('name'); } }