Arithmetic operators - do not report duplicitly what's already reported as a bug in PHPStan core

ondrejmirtes · ondrejmirtes · commit 4428a5abf067 · 2018-05-31T12:31:19.000+02:00
diff --git a/src/Rules/Operators/OperatorRuleHelper.php b/src/Rules/Operators/OperatorRuleHelper.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Type\ErrorType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
@@ -17,6 +18,10 @@ public static function isValidForArithmeticOperation(Type $type): bool
 			return true;
 		}
 
+		if ($type->toNumber() instanceof ErrorType) {
+			return true;
+		}
+
 		$acceptedType = new UnionType([new IntegerType(), new FloatType()]);
 
 		return $acceptedType->isSuperTypeOf($type)->yes();
diff --git a/tests/Levels/data/arithmeticOperators-0.json b/tests/Levels/data/arithmeticOperators-0.json
@@ -1,19 +1,9 @@
 [
-    {
-        "message": "Only numeric types are allowed in +, string given on the left side.",
-        "line": 26,
-        "ignorable": true
-    },
     {
         "message": "Only numeric types are allowed in +, string given on the left side.",
         "line": 27,
         "ignorable": true
     },
-    {
-        "message": "Only numeric types are allowed in +, int|string given on the left side.",
-        "line": 28,
-        "ignorable": true
-    },
     {
         "message": "Only numeric types are allowed in +, int|string given on the left side.",
         "line": 29,
diff --git a/tests/Rules/Operators/OperandsInArithmeticAdditionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticAdditionRuleTest.php
@@ -19,14 +19,6 @@ public function testRule(): void
 				'Only numeric types are allowed in +, string given on the right side.',
 				25,
 			],
-			[
-				'Only numeric types are allowed in +, array given on the right side.',
-				26,
-			],
-			[
-				'Only numeric types are allowed in +, stdClass given on the right side.',
-				27,
-			],
 			[
 				'Only numeric types are allowed in +, null given on the right side.',
 				28,
@@ -39,22 +31,6 @@ public function testRule(): void
 				'Only numeric types are allowed in +, string given on the right side.',
 				29,
 			],
-			[
-				'Only numeric types are allowed in +, array given on the right side.',
-				30,
-			],
-			[
-				'Only numeric types are allowed in +, array given on the left side.',
-				30,
-			],
-			[
-				'Only numeric types are allowed in +, string given on the right side.',
-				101,
-			],
-			[
-				'Only numeric types are allowed in +, string given on the left side.',
-				102,
-			],
 		]);
 	}
 
diff --git a/tests/Rules/Operators/OperandsInArithmeticDivisionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticDivisionRuleTest.php
@@ -19,14 +19,6 @@ public function testRule(): void
 				'Only numeric types are allowed in /, string given on the right side.',
 				64,
 			],
-			[
-				'Only numeric types are allowed in /, array given on the right side.',
-				65,
-			],
-			[
-				'Only numeric types are allowed in /, stdClass given on the right side.',
-				66,
-			],
 			[
 				'Only numeric types are allowed in /, null given on the right side.',
 				67,
@@ -39,14 +31,6 @@ public function testRule(): void
 				'Only numeric types are allowed in /, string given on the right side.',
 				68,
 			],
-			[
-				'Only numeric types are allowed in /, array given on the right side.',
-				69,
-			],
-			[
-				'Only numeric types are allowed in /, array given on the left side.',
-				69,
-			],
 		]);
 	}
 
diff --git a/tests/Rules/Operators/OperandsInArithmeticExponentiationRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticExponentiationRuleTest.php
@@ -19,14 +19,6 @@ public function testRule(): void
 				'Only numeric types are allowed in **, string given on the right side.',
 				77,
 			],
-			[
-				'Only numeric types are allowed in **, array given on the right side.',
-				78,
-			],
-			[
-				'Only numeric types are allowed in **, stdClass given on the right side.',
-				79,
-			],
 			[
 				'Only numeric types are allowed in **, null given on the right side.',
 				80,
@@ -39,14 +31,6 @@ public function testRule(): void
 				'Only numeric types are allowed in **, null given on the right side.',
 				81,
 			],
-			[
-				'Only numeric types are allowed in **, array given on the left side.',
-				82,
-			],
-			[
-				'Only numeric types are allowed in **, array given on the left side.',
-				82,
-			],
 		]);
 	}
 
diff --git a/tests/Rules/Operators/OperandsInArithmeticModuloRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticModuloRuleTest.php
@@ -19,14 +19,6 @@ public function testRule(): void
 				'Only numeric types are allowed in %, string given on the right side.',
 				90,
 			],
-			[
-				'Only numeric types are allowed in %, array given on the right side.',
-				91,
-			],
-			[
-				'Only numeric types are allowed in %, stdClass given on the right side.',
-				92,
-			],
 			[
 				'Only numeric types are allowed in %, null given on the right side.',
 				93,
@@ -39,14 +31,6 @@ public function testRule(): void
 				'Only numeric types are allowed in %, string given on the right side.',
 				94,
 			],
-			[
-				'Only numeric types are allowed in %, array given on the right side.',
-				95,
-			],
-			[
-				'Only numeric types are allowed in %, array given on the left side.',
-				95,
-			],
 		]);
 	}
 
diff --git a/tests/Rules/Operators/OperandsInArithmeticMultiplicationRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticMultiplicationRuleTest.php
@@ -19,14 +19,6 @@ public function testRule(): void
 				'Only numeric types are allowed in *, string given on the right side.',
 				51,
 			],
-			[
-				'Only numeric types are allowed in *, array given on the right side.',
-				52,
-			],
-			[
-				'Only numeric types are allowed in *, stdClass given on the right side.',
-				53,
-			],
 			[
 				'Only numeric types are allowed in *, null given on the right side.',
 				54,
@@ -39,14 +31,6 @@ public function testRule(): void
 				'Only numeric types are allowed in *, string given on the right side.',
 				55,
 			],
-			[
-				'Only numeric types are allowed in *, array given on the right side.',
-				56,
-			],
-			[
-				'Only numeric types are allowed in *, array given on the left side.',
-				56,
-			],
 		]);
 	}
 
diff --git a/tests/Rules/Operators/OperandsInArithmeticSubtractionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticSubtractionRuleTest.php
@@ -19,14 +19,6 @@ public function testRule(): void
 				'Only numeric types are allowed in -, string given on the right side.',
 				38,
 			],
-			[
-				'Only numeric types are allowed in -, array given on the right side.',
-				39,
-			],
-			[
-				'Only numeric types are allowed in -, stdClass given on the right side.',
-				40,
-			],
 			[
 				'Only numeric types are allowed in -, null given on the right side.',
 				41,
@@ -39,14 +31,6 @@ public function testRule(): void
 				'Only numeric types are allowed in -, string given on the right side.',
 				42,
 			],
-			[
-				'Only numeric types are allowed in -, array given on the right side.',
-				43,
-			],
-			[
-				'Only numeric types are allowed in -, array given on the left side.',
-				43,
-			],
 		]);
 	}
 
