From 8294b35df267442d92a672a21261a642784fea03 Mon Sep 17 00:00:00 2001 From: Edwin Siebel Date: Fri, 9 Jul 2021 16:32:49 +0200 Subject: [PATCH] (fix): add highlight check to active items --- CHANGELOG.md | 12 + composer.lock | 491 ++++++++++-------- config/taxonomies.php | 2 +- openpub-base.php | 2 +- src/Base/ElasticPress/ElasticPress.php | 15 +- src/Base/Foundation/Plugin.php | 2 +- src/Base/Models/Item.php | 69 +-- src/Base/Repositories/AbstractRepository.php | 13 +- src/Base/Repositories/Item.php | 10 +- src/Base/Repositories/Search.php | 38 +- .../RestAPI/Controllers/BaseController.php | 25 +- .../RestAPI/Controllers/ItemController.php | 53 +- .../RestAPI/Controllers/SearchController.php | 13 +- .../RestAPI/Controllers/ThemeController.php | 5 +- src/Base/RestAPI/RestAPIServiceProvider.php | 26 +- src/Base/Taxonomy/TaxonomyServiceProvider.php | 2 +- 16 files changed, 351 insertions(+), 427 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1645f8..7c1fbb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Version [2.0.10] + +### Fix + +- Add addHighlightedParameters to active items + +## Version [2.0.9] + +### Feat + +- Add author column for openpub items + ## Version [2.0.8] ### Feat diff --git a/composer.lock b/composer.lock index 09f7428..78f1cae 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "composer/installers", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d" + "reference": "ae03311f45dfe194412081526be2e003960df74b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", - "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", + "url": "https://api.github.com/repos/composer/installers/zipball/ae03311f45dfe194412081526be2e003960df74b", + "reference": "ae03311f45dfe194412081526be2e003960df74b", "shasum": "" }, "require": { @@ -111,6 +111,7 @@ "majima", "mako", "mediawiki", + "miaoxing", "modulework", "modx", "moodle", @@ -128,6 +129,7 @@ "sydes", "sylius", "symfony", + "tastyigniter", "typo3", "wordpress", "yawik", @@ -136,7 +138,7 @@ ], "support": { "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v1.10.0" + "source": "https://github.com/composer/installers/tree/v1.11.0" }, "funding": [ { @@ -152,20 +154,20 @@ "type": "tidelift" } ], - "time": "2021-01-14T11:07:16+00:00" + "time": "2021-04-28T06:42:17+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", "shasum": "" }, "require": { @@ -177,7 +179,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -216,7 +218,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" }, "funding": [ { @@ -232,20 +234,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", "shasum": "" }, "require": { @@ -254,7 +256,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -299,7 +301,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" }, "funding": [ { @@ -315,20 +317,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.2.3", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "72ca213014a92223a5d18651ce79ef441c12b694" + "reference": "46aa709affb9ad3355bd7a810f9662d71025c384" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/72ca213014a92223a5d18651ce79ef441c12b694", - "reference": "72ca213014a92223a5d18651ce79ef441c12b694", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46aa709affb9ad3355bd7a810f9662d71025c384", + "reference": "46aa709affb9ad3355bd7a810f9662d71025c384", "shasum": "" }, "require": { @@ -387,7 +389,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.2.3" + "source": "https://github.com/symfony/var-dumper/tree/v5.3.3" }, "funding": [ { @@ -403,19 +405,19 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-06-24T08:13:00+00:00" }, { "name": "wpackagist-plugin/elasticpress", - "version": "3.5.4", + "version": "3.6.0", "source": { "type": "svn", "url": "https://plugins.svn.wordpress.org/elasticpress/", - "reference": "tags/3.5.4" + "reference": "tags/3.6.0" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/plugin/elasticpress.3.5.4.zip" + "url": "https://downloads.wordpress.org/plugin/elasticpress.3.6.0.zip" }, "require": { "composer/installers": "~1.0" @@ -521,16 +523,16 @@ }, { "name": "composer/semver", - "version": "3.2.4", + "version": "3.2.5", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464" + "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/a02fdf930a3c1c3ed3a49b5f63859c0c20e10464", - "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464", + "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", + "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", "shasum": "" }, "require": { @@ -582,7 +584,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.4" + "source": "https://github.com/composer/semver/tree/3.2.5" }, "funding": [ { @@ -598,20 +600,20 @@ "type": "tidelift" } ], - "time": "2020-11-13T08:59:24+00:00" + "time": "2021-05-24T12:41:47+00:00" }, { "name": "composer/xdebug-handler", - "version": "1.4.5", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f28d44c286812c714741478d968104c5e604a1d4" + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", - "reference": "f28d44c286812c714741478d968104c5e604a1d4", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", "shasum": "" }, "require": { @@ -619,7 +621,8 @@ "psr/log": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "autoload": { @@ -645,7 +648,7 @@ "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" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" }, "funding": [ { @@ -661,32 +664,34 @@ "type": "tidelift" } ], - "time": "2020-11-13T08:04:11+00:00" + "time": "2021-05-05T19:37:51+00:00" }, { "name": "doctrine/annotations", - "version": "1.12.1", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b" + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", "shasum": "" }, "require": { "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "1.*", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^9.1.5" + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", "autoload": { @@ -729,9 +734,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.12.1" + "source": "https://github.com/doctrine/annotations/tree/1.13.1" }, - "time": "2021-02-21T21:00:45+00:00" + "time": "2021-05-16T18:07:53+00:00" }, { "name": "doctrine/instantiator", @@ -884,21 +889,21 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.18.2", + "version": "v2.19.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "18f8c9d184ba777380794a389fabc179896ba913" + "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/18f8c9d184ba777380794a389fabc179896ba913", - "reference": "18f8c9d184ba777380794a389fabc179896ba913", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5b8a9d852b292c2f8a035200fa6844b1f82300b", + "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b", "shasum": "" }, "require": { "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.2", + "composer/xdebug-handler": "^1.2 || ^2.0", "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", @@ -941,6 +946,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.19-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -955,6 +965,7 @@ "tests/Test/IntegrationCaseFactoryInterface.php", "tests/Test/InternalIntegrationCaseFactory.php", "tests/Test/IsIdenticalConstraint.php", + "tests/Test/TokensWithObservedTransformers.php", "tests/TestCase.php" ] }, @@ -975,7 +986,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.2" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.0" }, "funding": [ { @@ -983,7 +994,7 @@ "type": "github" } ], - "time": "2021-01-26T00:22:21+00:00" + "time": "2021-05-03T21:43:24+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -1331,16 +1342,16 @@ }, { "name": "php-stubs/wordpress-stubs", - "version": "v5.6.0", + "version": "v5.7.2", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-stubs.git", - "reference": "ed446cce304cd49f13900274b3ed60d1b526297e" + "reference": "beda02c58f1c4689d42c8dde6a84f7f0c9c93f42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/ed446cce304cd49f13900274b3ed60d1b526297e", - "reference": "ed446cce304cd49f13900274b3ed60d1b526297e", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/beda02c58f1c4689d42c8dde6a84f7f0c9c93f42", + "reference": "beda02c58f1c4689d42c8dde6a84f7f0c9c93f42", "shasum": "" }, "replace": { @@ -1369,9 +1380,9 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.6.0" + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.7.2" }, - "time": "2020-12-09T00:38:16+00:00" + "time": "2021-05-13T07:54:04+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1533,16 +1544,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.12.2", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "245710e971a030f42e08f4912863805570f23d39" + "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39", - "reference": "245710e971a030f42e08f4912863805570f23d39", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea", + "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea", "shasum": "" }, "require": { @@ -1594,22 +1605,22 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.12.2" + "source": "https://github.com/phpspec/prophecy/tree/1.13.0" }, - "time": "2020-12-19T10:15:11+00:00" + "time": "2021-03-17T13:42:18+00:00" }, { "name": "phpstan/phpstan", - "version": "0.12.78", + "version": "0.12.91", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "eecce8d2ee3cac6769f37b4cb1998b2715f82984" + "reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/eecce8d2ee3cac6769f37b4cb1998b2715f82984", - "reference": "eecce8d2ee3cac6769f37b4cb1998b2715f82984", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8226701cd228a0d63c2df995de7ab6070c69ac6a", + "reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a", "shasum": "" }, "require": { @@ -1640,13 +1651,17 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.78" + "source": "https://github.com/phpstan/phpstan/tree/0.12.91" }, "funding": [ { "url": "https://github.com/ondrejmirtes", "type": "github" }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, { "url": "https://www.patreon.com/phpstan", "type": "patreon" @@ -1656,7 +1671,7 @@ "type": "tidelift" } ], - "time": "2021-02-20T13:24:36+00:00" + "time": "2021-07-04T15:31:48+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1957,16 +1972,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.14", + "version": "8.5.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c25f79895d27b6ecd5abfa63de1606b786a461a3" + "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c25f79895d27b6ecd5abfa63de1606b786a461a3", - "reference": "c25f79895d27b6ecd5abfa63de1606b786a461a3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/79067856d85421c56d413bd238d4e2cd6b0e54da", + "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da", "shasum": "" }, "require": { @@ -2038,7 +2053,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.14" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.17" }, "funding": [ { @@ -2050,20 +2065,20 @@ "type": "github" } ], - "time": "2021-01-17T07:37:30+00:00" + "time": "2021-06-23T05:12:43+00:00" }, { - "name": "psr/container", - "version": "1.0.0", + "name": "psr/cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { @@ -2077,7 +2092,7 @@ }, "autoload": { "psr-4": { - "Psr\\Container\\": "src/" + "Psr\\Cache\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2090,6 +2105,50 @@ "homepage": "http://www.php-fig.org/" } ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/master" + }, + "time": "2016-08-06T20:24:11+00:00" + }, + { + "name": "psr/container", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "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": [ @@ -2101,9 +2160,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/event-dispatcher", @@ -2157,16 +2216,16 @@ }, { "name": "psr/log", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -2190,7 +2249,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -2201,9 +2260,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2020-03-23T09:12:05+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2936,20 +2995,21 @@ }, { "name": "symfony/console", - "version": "v5.2.3", + "version": "v5.3.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a" + "reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a", - "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a", + "url": "https://api.github.com/repos/symfony/console/zipball/649730483885ff2ca99ca0560ef0e5f6b03f2ac1", + "reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", @@ -3013,7 +3073,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.3" + "source": "https://github.com/symfony/console/tree/v5.3.2" }, "funding": [ { @@ -3029,20 +3089,20 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-06-12T09:42:48+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", "shasum": "" }, "require": { @@ -3051,7 +3111,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -3080,7 +3140,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" }, "funding": [ { @@ -3096,20 +3156,20 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.2.3", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367" + "reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4f9760f8074978ad82e2ce854dff79a71fe45367", - "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67a5f354afa8e2f231081b3fa11a5912f933c3ce", + "reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce", "shasum": "" }, "require": { @@ -3165,7 +3225,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.3.0" }, "funding": [ { @@ -3181,20 +3241,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:36:42+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2" + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11", + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11", "shasum": "" }, "require": { @@ -3207,7 +3267,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -3244,7 +3304,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0" }, "funding": [ { @@ -3260,20 +3320,20 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/filesystem", - "version": "v5.2.3", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "262d033b57c73e8b59cd6e68a45c528318b15038" + "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/262d033b57c73e8b59cd6e68a45c528318b15038", - "reference": "262d033b57c73e8b59cd6e68a45c528318b15038", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9", + "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9", "shasum": "" }, "require": { @@ -3306,7 +3366,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.2.3" + "source": "https://github.com/symfony/filesystem/tree/v5.3.3" }, "funding": [ { @@ -3322,20 +3382,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:01:46+00:00" + "time": "2021-06-30T07:27:52+00:00" }, { "name": "symfony/finder", - "version": "v5.2.3", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4adc8d172d602008c204c2e16956f99257248e03" + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03", - "reference": "4adc8d172d602008c204c2e16956f99257248e03", + "url": "https://api.github.com/repos/symfony/finder/zipball/0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", "shasum": "" }, "require": { @@ -3367,7 +3427,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.2.3" + "source": "https://github.com/symfony/finder/tree/v5.3.0" }, "funding": [ { @@ -3383,20 +3443,20 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-05-26T12:52:38+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.2.3", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce" + "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", - "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/162e886ca035869866d233a2bfef70cc28f9bbe5", + "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5", "shasum": "" }, "require": { @@ -3436,7 +3496,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.2.3" + "source": "https://github.com/symfony/options-resolver/tree/v5.3.0" }, "funding": [ { @@ -3452,20 +3512,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T12:56:27+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -3477,7 +3537,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3515,7 +3575,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" }, "funding": [ { @@ -3531,20 +3591,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", "shasum": "" }, "require": { @@ -3556,7 +3616,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3596,7 +3656,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" }, "funding": [ { @@ -3612,20 +3672,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { @@ -3637,7 +3697,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3680,7 +3740,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" }, "funding": [ { @@ -3696,7 +3756,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-php70", @@ -3768,16 +3828,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { @@ -3786,7 +3846,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3824,7 +3884,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" }, "funding": [ { @@ -3840,20 +3900,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { @@ -3862,7 +3922,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3903,7 +3963,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" }, "funding": [ { @@ -3919,20 +3979,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/process", - "version": "v5.2.3", + "version": "v5.3.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f" + "reference": "714b47f9196de61a196d86c4bad5f09201b307df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f", - "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f", + "url": "https://api.github.com/repos/symfony/process/zipball/714b47f9196de61a196d86c4bad5f09201b307df", + "reference": "714b47f9196de61a196d86c4bad5f09201b307df", "shasum": "" }, "require": { @@ -3965,7 +4025,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.2.3" + "source": "https://github.com/symfony/process/tree/v5.3.2" }, "funding": [ { @@ -3981,25 +4041,25 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-06-12T10:15:01+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1" + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.0" + "psr/container": "^1.1" }, "suggest": { "symfony/service-implementation": "" @@ -4007,7 +4067,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -4044,7 +4104,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/master" + "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" }, "funding": [ { @@ -4060,20 +4120,20 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-04-01T10:43:52+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.2.3", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c" + "reference": "313d02f59d6543311865007e5ff4ace05b35ee65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b12274acfab9d9850c52583d136a24398cdf1a0c", - "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/313d02f59d6543311865007e5ff4ace05b35ee65", + "reference": "313d02f59d6543311865007e5ff4ace05b35ee65", "shasum": "" }, "require": { @@ -4106,7 +4166,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.2.3" + "source": "https://github.com/symfony/stopwatch/tree/v5.3.0" }, "funding": [ { @@ -4122,20 +4182,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/string", - "version": "v5.2.3", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "c95468897f408dd0aca2ff582074423dd0455122" + "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122", - "reference": "c95468897f408dd0aca2ff582074423dd0455122", + "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", + "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", "shasum": "" }, "require": { @@ -4189,7 +4249,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.3" + "source": "https://github.com/symfony/string/tree/v5.3.3" }, "funding": [ { @@ -4205,7 +4265,7 @@ "type": "tidelift" } ], - "time": "2021-01-25T15:14:59+00:00" + "time": "2021-06-27T11:44:38+00:00" }, { "name": "szepeviktor/phpstan-wordpress", @@ -4323,30 +4383,35 @@ }, { "name": "webmozart/assert", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -4370,9 +4435,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.9.1" + "source": "https://github.com/webmozarts/assert/tree/1.10.0" }, - "time": "2020-07-08T17:02:28+00:00" + "time": "2021-03-09T10:59:23+00:00" } ], "aliases": [], @@ -4386,5 +4451,5 @@ "php": ">=7.0" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/config/taxonomies.php b/config/taxonomies.php index bf04298..6288350 100644 --- a/config/taxonomies.php +++ b/config/taxonomies.php @@ -52,7 +52,7 @@ 'show_admin_column' => true, 'capabilities' => [ 'manage_terms' => 'manage_options', - 'edit_terms' => 'manage_options', + 'edit_terms' => 'manage_options', 'delete_terms' => 'manage_options', 'assign_terms' => 'manage_categories' ] diff --git a/openpub-base.php b/openpub-base.php index 786534a..7e11ca9 100644 --- a/openpub-base.php +++ b/openpub-base.php @@ -4,7 +4,7 @@ * Plugin Name: Yard | OpenPub Base * Plugin URI: https://www.openwebconcept.nl/ * Description: Acts as foundation for other OpenPub related content plugins. This plugin implements actions to allow for other plugins to add and/or change Custom Posttypes, Metaboxes, Taxonomies, en Posts 2 posts relations. - * Version: 2.0.8 + * Version: 2.0.10 * Author: Yard | Digital Agency * Author URI: https://www.yard.nl/ * License: GPL-3.0 diff --git a/src/Base/ElasticPress/ElasticPress.php b/src/Base/ElasticPress/ElasticPress.php index 99b97f9..355e298 100644 --- a/src/Base/ElasticPress/ElasticPress.php +++ b/src/Base/ElasticPress/ElasticPress.php @@ -12,15 +12,10 @@ class ElasticPress private $config; /** - * @var Item $item + * @var \OWC\OpenPub\Base\Repositories\Item */ protected $item; - /** - * ElasticPress constructor. - * - * @param \OWC\OpenPub\Base\Foundation\Config $config - */ public function __construct($config, Item $item) { $this->config = $config; @@ -30,7 +25,7 @@ public function __construct($config, Item $item) /** * Initialize ElasticPress integration. */ - public function init() + public function init(): void { $this->setFilters(); } @@ -190,14 +185,10 @@ public function setPostSyncArgs($item, $postID) /** * Transforms the postArgs to a filterable object. * - * @param $item - * @param $postID - * - * @return array * @throws \OWC\OpenPub\Base\Exceptions\PropertyNotExistsException * @throws \ReflectionException */ - protected function transform($item, $postID): array + protected function transform(array $item, int $postID): array { $author = $item['post_author'] ?? []; $item = $this->item diff --git a/src/Base/Foundation/Plugin.php b/src/Base/Foundation/Plugin.php index 0cf1801..3ac7783 100644 --- a/src/Base/Foundation/Plugin.php +++ b/src/Base/Foundation/Plugin.php @@ -25,7 +25,7 @@ class Plugin * * @var string VERSION */ - const VERSION = '2.0.8'; + const VERSION = '2.0.10'; /** * Path to the root of the plugin. diff --git a/src/Base/Models/Item.php b/src/Base/Models/Item.php index f8ae6fb..b3e2969 100644 --- a/src/Base/Models/Item.php +++ b/src/Base/Models/Item.php @@ -34,12 +34,6 @@ class Item */ protected $meta; - /** - * Post constructor. - * - * @param array $data - * @param array|null $meta - */ public function __construct(array $data, array $meta = null) { $this->data = $data; @@ -47,20 +41,15 @@ public function __construct(array $data, array $meta = null) } /** - * Make Post model from WP_Post object - * - * @param \WP_Post $post - * @return Post + * Make Post model from WP_Post object. */ - public static function makeFrom(\WP_Post $post) + public static function makeFrom(\WP_Post $post): self { return new static($post->to_array()); } /** * Get the ID of the post. - * - * @return int */ public function getID(): int { @@ -69,8 +58,6 @@ public function getID(): int /** * Get the title of the post. - * - * @return string */ public function getTitle(): string { @@ -79,8 +66,6 @@ public function getTitle(): string /** * Get the title of the post. - * - * @return string */ public function getPostName(): string { @@ -89,8 +74,6 @@ public function getPostName(): string /** * Get the date of the post as a DateTime object. - * - * @return \DateTime */ public function getDate(): \DateTime { @@ -99,8 +82,6 @@ public function getDate(): \DateTime /** * Get the modified date of the post as a DateTime object. - * - * @return \DateTime */ public function getPostModified($gmt = false): \DateTime { @@ -111,10 +92,6 @@ public function getPostModified($gmt = false): \DateTime /** * Retrieve the date in localized format. - * - * @param string $format - * - * @return string */ public function getDateI18n(string $format): string { @@ -133,8 +110,6 @@ public function getPostType(): string /** * Get the permalink to the post. - * - * @return string */ public function getLink(): string { @@ -143,20 +118,14 @@ public function getLink(): string /** * Get the thumbnail URL of the author. - * - * @param string $size - * - * @return string */ - public function getThumbnail($size = 'post-thumbnail'): string + public function getThumbnail(string $size = 'post-thumbnail'): string { return get_the_post_thumbnail_url($this->getID(), $size) ?? ''; } /** * Determines if the post has a thumbnail - * - * @return bool */ public function hasThumbnail(): bool { @@ -165,10 +134,6 @@ public function hasThumbnail(): bool /** * Get the excerpt of the post, else fallback to the post content. - * - * @param integer $length - * - * @return string */ public function getExcerpt(int $length = 20): string { @@ -181,8 +146,6 @@ public function getExcerpt(int $length = 20): string /** * Get the content of the post. - * - * @return string */ public function getContent(): string { @@ -191,8 +154,6 @@ public function getContent(): string /** * Determines if the post has content. - * - * @return bool */ public function hasContent(): bool { @@ -201,8 +162,6 @@ public function hasContent(): bool /** * Get the taxonomies of a post. - * - * @return array */ public function getTaxonomies(): array { @@ -212,8 +171,6 @@ public function getTaxonomies(): array /** * Get the terms of a particular taxonomy. * - * @param string $taxonomy - * * @return \WP_Term[] */ public function getTerms(string $taxonomy) @@ -224,9 +181,6 @@ public function getTerms(string $taxonomy) /** * Get a particular key from the data. * - * @param string $value - * @param string $default - * * @return mixed */ protected function getKey(string $value, string $default = '') @@ -237,9 +191,6 @@ protected function getKey(string $value, string $default = '') /** * Get a meta value from the metadata. * - * @param string $value - * @param string $default - * @param bool $single * @param null|string $prefix * * @return mixed @@ -267,9 +218,7 @@ public function getPortalURL(): string /** * Create portal url, used in 'pdc items' overview - * When connected add 'pdc category', 'pdc-subcategory', name and post ID to url - * - * @return string + * When connected add 'pdc category', 'pdc-subcategory', name and post ID to url. */ private function createPortalURL(): string { @@ -279,14 +228,4 @@ private function createPortalURL(): string return $portalURL; } - - /** - * @param array $array - * - * @return array - */ - public function arrayUnique($array): array - { - return is_array($array) ? array_unique($array) : []; - } } diff --git a/src/Base/Repositories/AbstractRepository.php b/src/Base/Repositories/AbstractRepository.php index ab38a4a..86ea4ac 100644 --- a/src/Base/Repositories/AbstractRepository.php +++ b/src/Base/Repositories/AbstractRepository.php @@ -10,6 +10,7 @@ abstract class AbstractRepository { + /** @var string */ protected $posttype; /** @@ -21,22 +22,16 @@ abstract class AbstractRepository /** * Arguments for the WP_Query. - * - * @var array */ protected $queryArgs = []; /** * Fields that need to be hidden. - * - * @var array */ protected $hidden = []; /** * Dynamically added fields. - * - * @var array */ protected $fields = []; @@ -143,12 +138,8 @@ public function getQuery() /** * Add additional query arguments. - * - * @param array $args - * - * @return $this */ - public function query(array $args) + public function query(array $args): AbstractRepository { $this->queryArgs = array_merge($this->queryArgs, $args); diff --git a/src/Base/Repositories/Item.php b/src/Base/Repositories/Item.php index 243e2aa..bd8fe25 100644 --- a/src/Base/Repositories/Item.php +++ b/src/Base/Repositories/Item.php @@ -10,12 +10,8 @@ class Item extends AbstractRepository /** * Add additional query arguments. - * - * @param array $args - * - * @return $this */ - public function query(array $args) + public function query(array $args): AbstractRepository { $this->queryArgs = array_merge($this->queryArgs, $args); @@ -72,10 +68,6 @@ public static function addHighlightedParameters(bool $highlighted): array /** * Add parameters to tax_query used for filtering items on selected blog (id) slugs. - * - * @param string $blogSlug - * - * @return array */ public static function addShowOnParameter(string $blogSlug): array { diff --git a/src/Base/Repositories/Search.php b/src/Base/Repositories/Search.php index 0e0b0c3..8b57864 100644 --- a/src/Base/Repositories/Search.php +++ b/src/Base/Repositories/Search.php @@ -10,24 +10,13 @@ class Search extends Item protected static $globalFields = []; - /** - * @var WP_REST_Request - */ + /** @var WP_REST_Request */ protected $request; - /** - * @var array - */ + /** @var array */ protected $whitelist = ['s', 'posts_per_page']; - /** - * Search constructor. - * - * @param WP_REST_Request $request - * - * @throws \OWC\OpenPub\Base\Exceptions\PropertyNotExistsException - * @throws \ReflectionException - */ + /** @throws \ReflectionException|\OWC\OpenPub\Base\Exceptions\PropertyNotExistsException */ public function __construct(WP_REST_Request $request) { parent::__construct(); @@ -37,12 +26,8 @@ public function __construct(WP_REST_Request $request) /** * Add additional query arguments. - * - * @param array $args - * - * @return $this */ - public function query(array $args) + public function query(array $args): AbstractRepository { $this->queryArgs = array_merge($this->queryArgs, $args); $this->queryArgs = array_merge($this->queryArgs, $this->addSearchParameters()); @@ -50,10 +35,7 @@ public function query(array $args) return $this; } - /** - * @return array - */ - private function addSearchParameters() + private function addSearchParameters(): array { return [ 'post_type' => 'any', @@ -63,18 +45,12 @@ private function addSearchParameters() ]; } - /** - * @return string - */ - protected function sanitizeSearch() + protected function sanitizeSearch(): string { return sanitize_text_field($this->request->get_param('s')); } - /** - * @return int - */ - protected function perPage() + protected function perPage(): int { $amount = $this->request->get_param('posts_per_page') ?? 10; diff --git a/src/Base/RestAPI/Controllers/BaseController.php b/src/Base/RestAPI/Controllers/BaseController.php index 51349d7..5d7fb62 100644 --- a/src/Base/RestAPI/Controllers/BaseController.php +++ b/src/Base/RestAPI/Controllers/BaseController.php @@ -3,17 +3,13 @@ namespace OWC\OpenPub\Base\RestAPI\Controllers; use OWC\OpenPub\Base\Foundation\Plugin; +use OWC\OpenPub\Base\Repositories\AbstractRepository; use WP_Query; use WP_REST_Request; abstract class BaseController { - - /** - * Instance of the plugin. - * - * @var Plugin - */ + /** @var Plugin */ protected $plugin; public function __construct(Plugin $plugin) @@ -21,13 +17,13 @@ public function __construct(Plugin $plugin) $this->plugin = $plugin; } + public function response(AbstractRepository $data): array + { + return $this->addPaginator($data->all(), $data->getQuery()); + } + /** * Merges a paginator, based on a WP_Query, inside a data arary. - * - * @param array $data - * @param WP_Query $query - * - * @return array */ protected function addPaginator(array $data, WP_Query $query): array { @@ -49,13 +45,8 @@ protected function addPaginator(array $data, WP_Query $query): array /** * Get the paginator query params for a given query. - * - * @param WP_REST_Request $request - * @param int $limit - * - * @return array */ - protected function getPaginatorParams(WP_REST_Request $request, int $limit = 10) + protected function getPaginatorParams(WP_REST_Request $request, int $limit = 10): array { return array_merge($request->get_params(), [ 'posts_per_page' => $request->get_param('limit') ?: $limit, diff --git a/src/Base/RestAPI/Controllers/ItemController.php b/src/Base/RestAPI/Controllers/ItemController.php index c928cc4..c2b3c54 100644 --- a/src/Base/RestAPI/Controllers/ItemController.php +++ b/src/Base/RestAPI/Controllers/ItemController.php @@ -13,54 +13,41 @@ class ItemController extends BaseController /** * Get a list of all items, active and inactive. * - * @param WP_REST_Request $request - * - * @return array - * @throws \OWC\OpenPub\Base\Exceptions\PropertyNotExistsException - * @throws \ReflectionException + * @throws \ReflectionException|\OWC\OpenPub\Base\Exceptions\PropertyNotExistsException */ - public function getItems(WP_REST_Request $request) + public function getItems(WP_REST_Request $request): array { - $items = (new Item()) - ->query(apply_filters('owc/openpub/rest-api/items/query', $this->getPaginatorParams($request))); + $items = $this->itemQueryBuilder($request); - if ($this->hasHighlightedParam($request)) { - $items->query(Item::addHighlightedParameters($this->getHighlightedParam($request))); - } - - if ($this->showOnParamIsValid($request) && $this->plugin->settings->useShowOn()) { - $items->query(Item::addShowOnParameter($request->get_param('source'))); - } - - $data = $items->all(); - $query = $items->getQuery(); - - return $this->addPaginator($data, $query); + return $this->response($items); } /** * Get a list of all active items. * - * @param WP_REST_Request $request - * - * @return array - * @throws \OWC\OpenPub\Base\Exceptions\PropertyNotExistsException - * @throws \ReflectionException + * @throws \ReflectionException|\OWC\OpenPub\Base\Exceptions\PropertyNotExistsException */ - public function getActiveItems(WP_REST_Request $request) + public function getActiveItems(WP_REST_Request $request): array { - $items = (new Item()) - ->query(apply_filters('owc/openpub/rest-api/items/query', $this->getPaginatorParams($request))) + $items = $this->itemQueryBuilder($request) ->query(Item::addExpirationParameters()); + return $this->response($items); + } + + protected function itemQueryBuilder(WP_REST_Request $request = null): Item + { + $items = new Item(); + $items = $items->query(apply_filters('owc/openpub/rest-api/items/query', $this->getPaginatorParams($request))); + + if ($this->hasHighlightedParam($request)) { + $items->query(Item::addHighlightedParameters($this->getHighlightedParam($request))); + } + if ($this->showOnParamIsValid($request) && $this->plugin->settings->useShowOn()) { $items->query(Item::addShowOnParameter($request->get_param('source'))); } - - $data = $items->all(); - $query = $items->getQuery(); - - return $this->addPaginator($data, $query); + return $items; } /** diff --git a/src/Base/RestAPI/Controllers/SearchController.php b/src/Base/RestAPI/Controllers/SearchController.php index 90eeb7a..baa8c7f 100644 --- a/src/Base/RestAPI/Controllers/SearchController.php +++ b/src/Base/RestAPI/Controllers/SearchController.php @@ -11,21 +11,14 @@ class SearchController extends ItemController /** * Search all items. * - * @param WP_REST_Request $request - * - * @return array - * @throws \OWC\OpenPub\Base\Exceptions\PropertyNotExistsException - * @throws \ReflectionException + * @throws \ReflectionException|\OWC\OpenPub\Base\Exceptions\PropertyNotExistsException */ - public function search(WP_REST_Request $request) + public function search(WP_REST_Request $request): array { $search = (new Search($request)) ->query(['post_type' => 'any']) ->query(apply_filters('owc/openpub/rest-api/search/query', $this->getPaginatorParams($request))); - $data = $search->all(); - $query = $search->getQuery(); - - return $this->addPaginator($data, $query); + return $this->response($search); } } diff --git a/src/Base/RestAPI/Controllers/ThemeController.php b/src/Base/RestAPI/Controllers/ThemeController.php index 19e9c0d..baee526 100644 --- a/src/Base/RestAPI/Controllers/ThemeController.php +++ b/src/Base/RestAPI/Controllers/ThemeController.php @@ -23,10 +23,7 @@ public function getThemes(WP_REST_Request $request) $themes = (new Theme()) ->query(apply_filters('owc/openpub/rest-api/items/query', $this->getPaginatorParams($request))); - $data = $themes->all(); - $query = $themes->getQuery(); - - return $this->addPaginator($data, $query); + return $this->response($themes); } /** diff --git a/src/Base/RestAPI/RestAPIServiceProvider.php b/src/Base/RestAPI/RestAPIServiceProvider.php index 4308580..934fd88 100644 --- a/src/Base/RestAPI/RestAPIServiceProvider.php +++ b/src/Base/RestAPI/RestAPIServiceProvider.php @@ -10,15 +10,11 @@ class RestAPIServiceProvider extends ServiceProvider { - /** - * @var string - */ + /** @var string */ private $namespace = 'owc/openpub/v1'; /** * Register the service provider. - * - * @return void */ public function register(): void { @@ -54,10 +50,8 @@ public function register(): void * * Endpoint of searching. * @link https://url/wp-json/owc/openpub/v1/search - * - * @return void */ - public function registerRoutes() + public function registerRoutes(): void { register_rest_route($this->namespace, 'items/active', [ 'methods' => WP_REST_Server::READABLE, @@ -99,9 +93,6 @@ public function registerRoutes() /** * Whitelist endpoints within Config Expander. - * - * @param array $whitelist - * @return array */ public function whitelist(array $whitelist): array { @@ -118,8 +109,6 @@ public function whitelist(array $whitelist): array /** * Register fields for all configured posttypes. - * - * @return void */ private function registerModelFields(): void { @@ -127,12 +116,13 @@ private function registerModelFields(): void foreach ($this->plugin->config->get('api.models') as $posttype => $data) { foreach ($data['fields'] as $key => $creator) { $class = '\OWC\OpenPub\Base\Repositories\\' . ucfirst($posttype); - if (class_exists($class)) { - $creator = new $creator($this->plugin); - $class::addGlobalField($key, $creator, function () use ($creator) { - return $creator->executeCondition()(); - }); + if (!class_exists($class)) { + throw new \Exception(sprintf('%s does not exist', $class)); } + $creator = new $creator($this->plugin); + $class::addGlobalField($key, $creator, function () use ($creator) { + return $creator->executeCondition()(); + }); } } } diff --git a/src/Base/Taxonomy/TaxonomyServiceProvider.php b/src/Base/Taxonomy/TaxonomyServiceProvider.php index 1695a46..7f46f26 100644 --- a/src/Base/Taxonomy/TaxonomyServiceProvider.php +++ b/src/Base/Taxonomy/TaxonomyServiceProvider.php @@ -67,7 +67,7 @@ protected function filterConfigTaxonomies(): array } return array_filter($this->plugin->config->get('taxonomies'), function ($taxonomyKey) { - return $taxonomyKey !== 'openpub-show-on'; + return ('openpub-show-on' !== $taxonomyKey); }, ARRAY_FILTER_USE_KEY); } }