From e67dbd7e703814371ebc39f92fcdf18dad0f8bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Jul 2020 11:55:30 +0200 Subject: [PATCH 1/6] chore(dev-deps): updated qa dev deps --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index dfe7837..ff5e5a6 100644 --- a/composer.json +++ b/composer.json @@ -39,24 +39,24 @@ }, "require-dev" : { "captainhook/plugin-composer": "^4.0", - "consistence/coding-standard": "^3.10", + "consistence/coding-standard": "^3.10.1", "fig/http-message-util": "^1.1.4", - "friendsofphp/php-cs-fixer": "^2.16", + "friendsofphp/php-cs-fixer": "^2.16.4", "infection/infection": "^0.13 || ^0.14 || ^0.15", - "jangregor/phpstan-prophecy": "^0.6.1", + "jangregor/phpstan-prophecy": "^0.6.2", "mikey179/vfsstream": "^1.6", "monolog/monolog": "^1.23 | ^2.0", "phpspec/prophecy": "^1.9", - "phpstan/phpstan": "^0.12.9", - "phpstan/phpstan-phpunit": "^0.12.6", + "phpstan/phpstan": "^0.12.32", + "phpstan/phpstan-phpunit": "^0.12.11", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^7.4 || ^8.0", "roave/security-advisories": "dev-master", "slevomat/coding-standard": "^6.0", "squizlabs/php_codesniffer": "^3.4 || ^3.5", "symfony/cache": "^4.3", - "vimeo/psalm": "^3.8.5", - "laminas/laminas-servicemanager": "^3.3" + "vimeo/psalm": "^3.12.2", + "laminas/laminas-servicemanager": "^3.4" }, "config": { "optimize-autoloader": true, From 8b5f086402a0e13f9edc0960520933cffc82a1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Jul 2020 11:56:48 +0200 Subject: [PATCH 2/6] fix(null-cache): getMultiple return covariance (phpdoc) --- src/Common/Cache/NullCache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common/Cache/NullCache.php b/src/Common/Cache/NullCache.php index 341601b..b98be07 100644 --- a/src/Common/Cache/NullCache.php +++ b/src/Common/Cache/NullCache.php @@ -35,7 +35,7 @@ public function get($key, $default = null) /** * {@inheritdoc} * - * @return mixed + * @return iterable */ public function getMultiple($keys, $default = null) { From 5fef73805b65297117a4e3e891dd6a4cfcde0661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Jul 2020 11:57:41 +0200 Subject: [PATCH 3/6] chore(phpstan): remove covariance ignore --- phpstan.neon | 4 ---- 1 file changed, 4 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 5cf9665..4da0d3d 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -12,10 +12,6 @@ parameters: checkGenericClassInNonGenericObjectType: false reportUnmatchedIgnoredErrors: true ignoreErrors: - # for covariance allowed failures - - - message: '#Return type(.*)RuntimeException(.*)of method(.*)should be covariant#' - path: src/Common/Exception/ProcessException.php - message: '#Instanceof between(.*)VideoFilterInterface and (.*)VideoFilterInterface will(.*)evaluate to true.#' path: src/Video/Filter/VideoFilterChain.php From 0c4ba33bbb809809824ed919ac024567d3d40f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Jul 2020 11:58:09 +0200 Subject: [PATCH 4/6] fix(exception): avoid possible covariance issue --- src/Common/Exception/ProcessExceptionInterface.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/Exception/ProcessExceptionInterface.php b/src/Common/Exception/ProcessExceptionInterface.php index 97958ac..b35ca3e 100644 --- a/src/Common/Exception/ProcessExceptionInterface.php +++ b/src/Common/Exception/ProcessExceptionInterface.php @@ -11,7 +11,7 @@ namespace Soluble\MediaTools\Common\Exception; -use Symfony\Component\Process\Exception as SymfonyProcessException; +use Symfony\Component\Process\Exception as SPException; use Symfony\Component\Process\Process; interface ProcessExceptionInterface extends ExceptionInterface @@ -19,7 +19,7 @@ interface ProcessExceptionInterface extends ExceptionInterface public function getProcess(): Process; /** - * @return SymfonyProcessException\ProcessFailedException|SymfonyProcessException\ProcessSignaledException|SymfonyProcessException\ProcessTimedOutException + * @return SPException\RuntimeException|SPException\ProcessFailedException|SPException\ProcessSignaledException|SPException\ProcessTimedOutException */ - public function getSymfonyProcessRuntimeException(): SymfonyProcessException\RuntimeException; + public function getSymfonyProcessRuntimeException(): SPException\RuntimeException; } From a1d2d3fbb904def9b9e372bf16eee762ce81f070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Jul 2020 12:00:46 +0200 Subject: [PATCH 5/6] doc(changelog): entries for 2.1.1 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a86cb7..30ac06e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 2.1.1 (2020-07-10) + +### Fixed + +- [Minor] phpdoc covariance issue in NullCache +- [Minor] process-exception possible covariance issue when extending + +### Dev + +- [Q&A] Updated phpstan/psalm and few dev deps + ## 2.1.0 (2019-12-21) ### Added From 4a3490ea3512917153d95a2b01117da4c9a54672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Jul 2020 12:04:56 +0200 Subject: [PATCH 6/6] doc(changelog): add link to P/R --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30ac06e..89d60de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed -- [Minor] phpdoc covariance issue in NullCache -- [Minor] process-exception possible covariance issue when extending +- [Minor] phpdoc covariance issue in NullCache, in [#21](https://github.com/soluble-io/soluble-mediatools/pull/21) +- [Minor] process-exception possible covariance issue when extending, in [#21](https://github.com/soluble-io/soluble-mediatools/pull/21) ### Dev -- [Q&A] Updated phpstan/psalm and few dev deps +- [Q&A] Updated phpstan/psalm and few dev deps, in [#21](https://github.com/soluble-io/soluble-mediatools/pull/21) ## 2.1.0 (2019-12-21)