Merge branch refs/heads/1.11.x into 1.12.x

Author: phpstan-bot

src/Type/Php/RegexArrayShapeMatcher.php

@@ -351,9 +351,6 @@ private function createSubjectValueType(TrinaryLogic $wasMatched, int $flags, bo
 		$subjectValueType = TypeCombinator::removeNull($this->getValueType(new StringType(), $flags, $matchesAll));
 
 		if ($matchesAll) {
-			if (!$wasMatched->yes() && !$this->containsOffsetCapture($flags)) {
-				$subjectValueType = TypeCombinator::union($subjectValueType, new ConstantStringType(''));
-			}
 			if ($this->containsPatternOrder($flags)) {
 				$subjectValueType = AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), $subjectValueType));
 			}

tests/PHPStan/Analyser/nsrt/preg_match_all_shapes.php

@@ -144,4 +144,22 @@ public function sayHello(string $content): void
 
 		assertType('array{list<array{string, int<0, max>}>}', $matches);
 	}
+
+	public function sayFoo(string $content): void
+	{
+		if (preg_match_all("~text=~mU", $content, $matches, PREG_SET_ORDER) === 0) {
+			return;
+		}
+
+		assertType('list<array{string}>', $matches);
+	}
+
+	public function sayBar(string $content): void
+	{
+		if (preg_match_all("~text=~mU", $content, $matches, PREG_PATTERN_ORDER) === 0) {
+			return;
+		}
+
+		assertType('array{list<string>}', $matches);
+	}
 }