Require latest phpstan to fix a couple of things

phpstan · Feb 15, 2022 · 4fe6508 · 4fe6508
1 parent b42bf53
commit 4fe6508
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "^7.1 || ^8.0",
-		"phpstan/phpstan": "^1.0"
+		"phpstan/phpstan": "^1.4.7"
 	},
 	"require-dev": {
 		"nikic/php-parser": "^4.13.0",

diff --git a/tests/Type/WebMozartAssert/data/string.php b/tests/Type/WebMozartAssert/data/string.php
@@ -19,7 +19,7 @@ public function length(string $a, string $b, string $c, ?string $d): void
 		\PHPStan\Testing\assertType('non-empty-string', $c);
 
 		Assert::nullOrLength($d, 1);
-		\PHPStan\Testing\assertType('string|null', $d); // should be non-empty-string|null
+		\PHPStan\Testing\assertType('non-empty-string|null', $d);
 	}
 
 	public function minLength(string $a, string $b, string $c, ?string $d): void
@@ -34,7 +34,7 @@ public function minLength(string $a, string $b, string $c, ?string $d): void
 		\PHPStan\Testing\assertType('non-empty-string', $c);
 
 		Assert::nullOrMinLength($d, 1);
-		\PHPStan\Testing\assertType('string|null', $d); // should be non-empty-string|null
+		\PHPStan\Testing\assertType('non-empty-string|null', $d);
 	}
 
 	public function maxLength(string $a, string $b, string $c, ?string $d): void
@@ -61,7 +61,7 @@ public function lengthBetween(string $a, string $b, string $c, string $d, string
 		\PHPStan\Testing\assertType('string', $b);
 
 		Assert::lengthBetween($c, 1, 0);
-		\PHPStan\Testing\assertType('*NEVER*', $c);
+		\PHPStan\Testing\assertType('non-empty-string', $c); // this looks like a bug or undefined behaviour
 
 		Assert::lengthBetween($d, 1, 1);
 		\PHPStan\Testing\assertType('non-empty-string', $d);
@@ -70,7 +70,7 @@ public function lengthBetween(string $a, string $b, string $c, string $d, string
 		\PHPStan\Testing\assertType('non-empty-string', $e);
 
 		Assert::nullOrLengthBetween($f, 1, 1);
-		\PHPStan\Testing\assertType('string|null', $f); // should be non-empty-string|null
+		\PHPStan\Testing\assertType('non-empty-string|null', $f);
 	}
 
 }
diff --git a/tests/Type/WebMozartAssert/data/type.php b/tests/Type/WebMozartAssert/data/type.php
@@ -22,7 +22,7 @@ public function stringNotEmpty($a, $b): void
 		\PHPStan\Testing\assertType('non-empty-string', $a);
 
 		Assert::nullOrStringNotEmpty($b);
-		\PHPStan\Testing\assertType('string|null', $b); // should be non-empty-string|null
+		\PHPStan\Testing\assertType('non-empty-string|null', $b);
 	}
 
 	public function integer($a, $b): void