Don't return plain false when the param is not of the type we know ho…

…w to process (#167) Close #166
spaze · Jan 23, 2023 · cc97bfb · cc97bfb
2 parents d8b634b + 69a21d3
commit cc97bfb
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 7 deletions.
diff --git a/src/DisallowedHelper.php b/src/DisallowedHelper.php
@@ -19,6 +19,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\UnionType;
+use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 use Spaze\PHPStan\Rules\Disallowed\Params\DisallowedCallParam;
 
 class DisallowedHelper
@@ -118,8 +119,12 @@ private function hasAllowedParams(Scope $scope, ?CallLike $node, array $allowCon
 				$types = [$type];
 			}
 			foreach ($types as $type) {
-				if (!$param->matches($type)) {
-					return false;
+				try {
+					if (!$param->matches($type)) {
+						return false;
+					}
+				} catch (UnsupportedParamTypeException $e) {
+					return !$paramsRequired;
 				}
 			}
 		}

diff --git a/src/Exceptions/UnsupportedParamTypeException.php b/src/Exceptions/UnsupportedParamTypeException.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types = 1);
+
+namespace Spaze\PHPStan\Rules\Disallowed\Exceptions;
+
+use Exception;
+
+class UnsupportedParamTypeException extends Exception
+{
+}
diff --git a/src/Params/DisallowedCallParamValueCaseInsensitiveExcept.php b/src/Params/DisallowedCallParamValueCaseInsensitiveExcept.php
@@ -6,17 +6,21 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\Type;
+use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 
 /**
  * @extends DisallowedCallParamValue<int|bool|string|null>
  */
 class DisallowedCallParamValueCaseInsensitiveExcept extends DisallowedCallParamValue
 {
 
+	/**
+	 * @throws UnsupportedParamTypeException
+	 */
 	public function matches(Type $type): bool
 	{
 		if (!$type instanceof ConstantScalarType) {
-			return false;
+			throw new UnsupportedParamTypeException();
 		}
 		$a = is_string($this->getValue()) ? strtolower($this->getValue()) : $this->getValue();
 		$b = $type instanceof ConstantStringType ? strtolower($type->getValue()) : $type->getValue();

diff --git a/src/Params/DisallowedCallParamValueExcept.php b/src/Params/DisallowedCallParamValueExcept.php
@@ -5,17 +5,21 @@
 
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\Type;
+use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 
 /**
  * @extends DisallowedCallParamValue<int|bool|string|null>
  */
 class DisallowedCallParamValueExcept extends DisallowedCallParamValue
 {
 
+	/**
+	 * @throws UnsupportedParamTypeException
+	 */
 	public function matches(Type $type): bool
 	{
 		if (!$type instanceof ConstantScalarType) {
-			return false;
+			throw new UnsupportedParamTypeException();
 		}
 		return $this->getValue() !== $type->getValue();
 	}

diff --git a/src/Params/DisallowedCallParamValueFlagExcept.php b/src/Params/DisallowedCallParamValueFlagExcept.php
@@ -5,17 +5,21 @@
 
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Type;
+use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 
 /**
  * @extends DisallowedCallParamValue<int>
  */
 class DisallowedCallParamValueFlagExcept extends DisallowedCallParamValue
 {
 
+	/**
+	 * @throws UnsupportedParamTypeException
+	 */
 	public function matches(Type $type): bool
 	{
 		if (!$type instanceof ConstantIntegerType) {
-			return false;
+			throw new UnsupportedParamTypeException();
 		}
 		return ($this->getValue() & $type->getValue()) === 0;
 	}

diff --git a/src/Params/DisallowedCallParamValueFlagSpecific.php b/src/Params/DisallowedCallParamValueFlagSpecific.php
@@ -5,17 +5,21 @@
 
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Type;
+use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 
 /**
  * @extends DisallowedCallParamValue<int>
  */
 class DisallowedCallParamValueFlagSpecific extends DisallowedCallParamValue
 {
 
+	/**
+	 * @throws UnsupportedParamTypeException
+	 */
 	public function matches(Type $type): bool
 	{
 		if (!$type instanceof ConstantIntegerType) {
-			return false;
+			throw new UnsupportedParamTypeException();
 		}
 		return ($this->getValue() & $type->getValue()) !== 0;
 	}

diff --git a/src/Params/DisallowedCallParamValueSpecific.php b/src/Params/DisallowedCallParamValueSpecific.php
@@ -5,17 +5,21 @@
 
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\Type;
+use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 
 /**
  * @extends DisallowedCallParamValue<int|bool|string|null>
  */
 class DisallowedCallParamValueSpecific extends DisallowedCallParamValue
 {
 
+	/**
+	 * @throws UnsupportedParamTypeException
+	 */
 	public function matches(Type $type): bool
 	{
 		if (!$type instanceof ConstantScalarType) {
-			return false;
+			throw new UnsupportedParamTypeException();
 		}
 		return $this->getValue() === $type->getValue();
 	}

diff --git a/tests/src/disallowed-allow/functionCalls.php b/tests/src/disallowed-allow/functionCalls.php
@@ -81,3 +81,6 @@
 // allowed when not FQCN to Blade class
 mocky(\Fiction\Pulp\Royale::class);
 mocky(\Waldo\Quux\Blade::class);
+
+// not disallowed
+hash((new stdClass())->property . 'foo', 'NAH');
diff --git a/tests/src/disallowed/functionCalls.php b/tests/src/disallowed/functionCalls.php
@@ -81,3 +81,6 @@
 // allowed when not FQCN to Blade class
 mocky(\Fiction\Pulp\Royale::class);
 mocky(\Waldo\Quux\Blade::class);
+
+// not disallowed
+hash((new stdClass())->property . 'foo', 'NAH');