Merge pull request #21 from soluble-io/fix/mixed-return-type

fix: covariance possible issues

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, 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, in [#21](https://github.com/soluble-io/soluble-mediatools/pull/21)
+
 ## 2.1.0 (2019-12-21)
 
 ### Added

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,

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

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)
     {

src/Common/Exception/ProcessExceptionInterface.php

@@ -11,15 +11,15 @@
 
 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
 {
     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;
 }