Merge branch '1.6.x' into HEAD

phpstan · May 15, 2022 · fc839cf · fc839cf
2 parents 0ecddcc + 92420cd
commit fc839cf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -623,8 +623,17 @@ public function getBitwiseNotType(Expr $expr, callable $getTypeCallback): Type
 			if ($type instanceof ConstantStringType) {
 				return new ConstantStringType(~$type->getValue());
 			}
-			if ($type instanceof StringType) {
-				return new StringType();
+			if ($type->isString()->yes()) {
+				$accessories = [
+					new StringType(),
+				];
+				if ($type->isNonEmptyString()->yes()) {
+					$accessories[] = new AccessoryNonEmptyStringType();
+				}
+				// it is not useful to apply numeric and literal strings here.
+				// numeric string isn't certainly kept numeric: 3v4l.org/JERDB
+
+				return TypeCombinator::intersect(...$accessories);
 			}
 			if ($type instanceof IntegerType || $type instanceof FloatType) {
 				return new IntegerType(); //no const types here, result depends on PHP_INT_SIZE

diff --git a/tests/PHPStan/Analyser/data/bitwise-not.php b/tests/PHPStan/Analyser/data/bitwise-not.php
@@ -6,10 +6,12 @@
 
 /**
  * @param string|int $stringOrInt
+ * @param non-empty-string $nonEmptyString
  */
-function foo(int $int, string $string, float $float, $stringOrInt) : void{
+function foo(int $int, string $string, float $float, $stringOrInt, string $nonEmptyString) : void{
 	assertType('int', ~$int);
 	assertType('string', ~$string);
+	assertType('non-empty-string', ~$nonEmptyString);
 	assertType('int', ~$float);
 	assertType('int|string', ~$stringOrInt);
 	assertType("'" . (~"abc") . "'", ~"abc");