From 0de3ab4979c707ca6c83f6a01dcbdef0395c7925 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 23:46:16 +0000 Subject: [PATCH 1/2] Update dependency laminas/laminas-coding-standard to v3 | datasource | package | from | to | | ---------- | ------------------------------- | ----- | ----- | | packagist | laminas/laminas-coding-standard | 2.5.0 | 3.0.1 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 107 +++++++++++++++++++++++++++----------------------- 2 files changed, 58 insertions(+), 51 deletions(-) diff --git a/composer.json b/composer.json index 3faae1e..9e95fb9 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-coding-standard": "~3.0.0", "laminas/laminas-stdlib": "^3.20", "phpbench/phpbench": "^1.3.1", "phpunit/phpunit": "^10.5.38", diff --git a/composer.lock b/composer.lock index b456041..65ee16c 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": "40d1c44b353071894a9468999393be57", + "content-hash": "ce1e90f049bf47f0930587ad27b18f12", "packages": [], "packages-dev": [ { @@ -468,35 +468,38 @@ }, { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.7.2", + "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db" + "url": "https://github.com/PHPCSStandards/composer-installer.git", + "reference": "4be43904336affa5c2f70744a348312336afd0da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db", - "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da", + "reference": "4be43904336affa5c2f70744a348312336afd0da", "shasum": "" }, "require": { "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3", + "php": ">=5.4", "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" }, "require-dev": { "composer/composer": "*", + "ext-json": "*", + "ext-zip": "*", "php-parallel-lint/php-parallel-lint": "^1.3.1", - "phpcompatibility/php-compatibility": "^9.0" + "phpcompatibility/php-compatibility": "^9.0", + "yoast/phpunit-polyfills": "^1.0" }, "type": "composer-plugin", "extra": { - "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" }, "autoload": { "psr-4": { - "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -512,7 +515,7 @@ }, { "name": "Contributors", - "homepage": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer/graphs/contributors" + "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors" } ], "description": "PHP_CodeSniffer Standards Composer Installer Plugin", @@ -536,10 +539,10 @@ "tests" ], "support": { - "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues", - "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer" + "issues": "https://github.com/PHPCSStandards/composer-installer/issues", + "source": "https://github.com/PHPCSStandards/composer-installer" }, - "time": "2022-02-04T12:51:07+00:00" + "time": "2023-01-05T11:28:13+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -895,27 +898,24 @@ }, { "name": "laminas/laminas-coding-standard", - "version": "2.5.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-coding-standard.git", - "reference": "c1aaa18a7c860c6932677a3e4ec13161f9fc7d61" + "reference": "ac809f5b27f0b22d0c1ec0cbc78cb67f92bfebcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/c1aaa18a7c860c6932677a3e4ec13161f9fc7d61", - "reference": "c1aaa18a7c860c6932677a3e4ec13161f9fc7d61", + "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/ac809f5b27f0b22d0c1ec0cbc78cb67f92bfebcb", + "reference": "ac809f5b27f0b22d0c1ec0cbc78cb67f92bfebcb", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0", "php": "^7.4 || ^8.0", - "slevomat/coding-standard": "^7.0", - "squizlabs/php_codesniffer": "^3.6", - "webimpress/coding-standard": "^1.2" - }, - "conflict": { - "phpstan/phpdoc-parser": ">=1.6.0" + "slevomat/coding-standard": "^8.15.0", + "squizlabs/php_codesniffer": "^3.10", + "webimpress/coding-standard": "^1.3" }, "type": "phpcodesniffer-standard", "autoload": { @@ -947,7 +947,7 @@ "type": "community_bridge" } ], - "time": "2023-01-05T15:53:40+00:00" + "time": "2024-10-16T09:23:09+00:00" }, { "name": "laminas/laminas-stdlib", @@ -1662,25 +1662,28 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.5.1", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "981cc368a216c988e862a75e526b6076987d1b50" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/981cc368a216c988e862a75e526b6076987d1b50", - "reference": "981cc368a216c988e862a75e526b6076987d1b50", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" @@ -1700,9 +1703,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.5.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2022-05-05T11:32:40+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3320,42 +3323,42 @@ }, { "name": "slevomat/coding-standard", - "version": "7.2.1", + "version": "8.15.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90" + "reference": "7d1d957421618a3803b593ec31ace470177d7817" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90", - "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817", + "reference": "7d1d957421618a3803b593ec31ace470177d7817", "shasum": "" }, "require": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": "^1.5.1", - "squizlabs/php_codesniffer": "^3.6.2" + "phpstan/phpdoc-parser": "^1.23.1", + "squizlabs/php_codesniffer": "^3.9.0" }, "require-dev": { - "phing/phing": "2.17.3", + "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.7.1", - "phpstan/phpstan-deprecation-rules": "1.0.0", - "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.2.3", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.20" + "phpstan/phpstan": "1.10.60", + "phpstan/phpstan-deprecation-rules": "1.1.4", + "phpstan/phpstan-phpunit": "1.3.16", + "phpstan/phpstan-strict-rules": "1.5.2", + "phpunit/phpunit": "8.5.21|9.6.8|10.5.11" }, "type": "phpcodesniffer-standard", "extra": { "branch-alias": { - "dev-master": "7.x-dev" + "dev-master": "8.x-dev" } }, "autoload": { "psr-4": { - "SlevomatCodingStandard\\": "SlevomatCodingStandard" + "SlevomatCodingStandard\\": "SlevomatCodingStandard/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3363,9 +3366,13 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", + "keywords": [ + "dev", + "phpcs" + ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/7.2.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.15.0" }, "funding": [ { @@ -3377,7 +3384,7 @@ "type": "tidelift" } ], - "time": "2022-05-25T10:58:12+00:00" + "time": "2024-03-09T15:20:58+00:00" }, { "name": "spatie/array-to-xml", @@ -4758,13 +4765,13 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1.99" }, From 42b7712c30e2b05b5b9ce4214f568b4916c0a488 Mon Sep 17 00:00:00 2001 From: George Steel Date: Wed, 30 Oct 2024 23:47:58 +0000 Subject: [PATCH 2/2] Remove useless doc blocks Signed-off-by: George Steel --- src/EventManager.php | 2 -- src/Filter/FilterInterface.php | 1 - src/Filter/FilterIterator.php | 1 - src/LazyEventListener.php | 4 ---- src/LazyListener.php | 4 ---- src/LazyListenerAggregate.php | 1 - src/SharedEventManagerInterface.php | 1 - src/Test/EventListenerIntrospectionTrait.php | 1 - 8 files changed, 15 deletions(-) diff --git a/src/EventManager.php b/src/EventManager.php index ed0837b..8a7ef01 100644 --- a/src/EventManager.php +++ b/src/EventManager.php @@ -66,8 +66,6 @@ class EventManager implements EventManagerInterface * * Allows optionally specifying identifier(s) to use to pull signals from a * SharedEventManagerInterface. - * - * @param array $identifiers */ public function __construct(?SharedEventManagerInterface $sharedEventManager = null, array $identifiers = []) { diff --git a/src/Filter/FilterInterface.php b/src/Filter/FilterInterface.php index 66dcda9..fc420ef 100644 --- a/src/Filter/FilterInterface.php +++ b/src/Filter/FilterInterface.php @@ -13,7 +13,6 @@ interface FilterInterface * Execute the filter chain * * @param string|object $context - * @param array $params * @return mixed */ public function run($context, array $params = []); diff --git a/src/Filter/FilterIterator.php b/src/Filter/FilterIterator.php index 9d10e03..bc5933e 100644 --- a/src/Filter/FilterIterator.php +++ b/src/Filter/FilterIterator.php @@ -101,7 +101,6 @@ public function remove($datum) * Iterates and calls the next filter in the chain. * * @param mixed $context - * @param array $params * @param FilterIterator $chain * @return mixed */ diff --git a/src/LazyEventListener.php b/src/LazyEventListener.php index 10b7a6c..422c43e 100644 --- a/src/LazyEventListener.php +++ b/src/LazyEventListener.php @@ -26,10 +26,6 @@ class LazyEventListener extends LazyListener /** @var null|int Priority at which to attach. */ private $priority; - /** - * @param array $definition - * @param array $env - */ public function __construct(array $definition, ContainerInterface $container, array $env = []) { parent::__construct($definition, $container, $env); diff --git a/src/LazyListener.php b/src/LazyListener.php index 86e68f6..706f08c 100644 --- a/src/LazyListener.php +++ b/src/LazyListener.php @@ -42,10 +42,6 @@ class LazyListener /** @var string Service name of listener. */ private $service; - /** - * @param array $definition - * @param array $env - */ public function __construct(array $definition, ContainerInterface $container, array $env = []) { if ( diff --git a/src/LazyListenerAggregate.php b/src/LazyListenerAggregate.php index 105a646..399ed82 100644 --- a/src/LazyListenerAggregate.php +++ b/src/LazyListenerAggregate.php @@ -60,7 +60,6 @@ class LazyListenerAggregate implements ListenerAggregateInterface * * @param array $listeners LazyEventListener instances or array definitions * to pass to the LazyEventListener constructor. - * @param array $env * @throws Exception\InvalidArgumentException For invalid listener items. */ public function __construct(array $listeners, ContainerInterface $container, array $env = []) diff --git a/src/SharedEventManagerInterface.php b/src/SharedEventManagerInterface.php index 4cdbc46..a2323bb 100644 --- a/src/SharedEventManagerInterface.php +++ b/src/SharedEventManagerInterface.php @@ -37,7 +37,6 @@ public function detach(callable $listener, $identifier = null, $eventName = null /** * Retrieve all listeners for given identifiers * - * @param array $identifiers * @param string $eventName * @return array */ diff --git a/src/Test/EventListenerIntrospectionTrait.php b/src/Test/EventListenerIntrospectionTrait.php index ae0fba6..5ee50a5 100644 --- a/src/Test/EventListenerIntrospectionTrait.php +++ b/src/Test/EventListenerIntrospectionTrait.php @@ -127,7 +127,6 @@ private function getArrayOfListenersForEvent($event, EventManager $events) /** * Generator for traversing listeners in priority order. * - * @param array $queue * @param bool $withPriority When true, yields priority as key. * @return iterable */