Merge pull request #44 from proget-hq/phpstan

Add compatibility with phpstan 0.12.91
proget-hq · Jul 8, 2021 · 41cc2da · 41cc2da
2 parents 1334dbf + 0b1dac6
commit 41cc2da
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  * **Fixed** for any bug fixes.
  * **Security** in case of vulnerabilities.
 
+## [0.7.5] 2021-07-08
+### Added
+ * Compatibility with phpstan 0.12.91 (#44)
+
 ## [0.7.4] 2021-04-26
 ### Added
  * Enable PHP 8.0 (#35)

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": "^7.2|^8.0",
         "nikic/php-parser": "^4.1.0",
-        "phpstan/phpstan": "^0.12"
+        "phpstan/phpstan": "^0.12.91"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.18",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Type/ActiveRecordObjectType.php b/src/Type/ActiveRecordObjectType.php
@@ -25,7 +25,7 @@ public function hasOffsetValueType(Type $offsetType): TrinaryLogic
         return parent::hasOffsetValueType($offsetType);
     }
 
-    public function setOffsetValueType(?Type $offsetType, Type $valueType): Type
+    public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $unionValues = true): Type
     {
         if ($offsetType instanceof ConstantStringType && $this->hasProperty($offsetType->getValue())->no()) {
             return new ErrorType();