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

Author: phpstan-bot

Diff for: src/Type/Php/RegexExpressionHelper.php

@@ -44,7 +44,7 @@ public function resolve(Expr $expr): Type
 					&& $expr->name instanceof Name
 					&& $expr->name->toLowerString() === 'preg_quote'
 				) {
-					return new ConstantStringType('');
+					return new ConstantStringType('.*');
 				}
 
 				if ($expr instanceof Concat) {

Diff for: tests/PHPStan/Rules/Regexp/RegularExpressionPatternRuleTest.php

@@ -119,27 +119,27 @@ public function testValidRegexPatternBefore73(): void
 					43,
 				],
 				[
-					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: nok',
+					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: nok.*',
 					57,
 				],
 				[
-					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: nok',
+					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: nok.*',
 					58,
 				],
 				[
-					'Regex pattern is invalid: Compilation failed: missing ) at offset 1 in pattern: ~(~',
+					'Regex pattern is invalid: Compilation failed: missing ) at offset 3 in pattern: ~(.*~',
 					59,
 				],
 				[
-					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: noknono',
+					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: nok.*nono',
 					61,
 				],
 				[
-					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: noknope',
+					'Regex pattern is invalid: Delimiter must not be alphanumeric or backslash in pattern: nok.*nope',
 					62,
 				],
 				[
-					'Regex pattern is invalid: Compilation failed: missing ) at offset 1 in pattern: ~(~',
+					'Regex pattern is invalid: Compilation failed: missing ) at offset 3 in pattern: ~(.*~',
 					63,
 				],
 			],
@@ -249,27 +249,27 @@ public function testValidRegexPatternAfter73(): void
 					43,
 				],
 				[
-					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: nok', $messagePart),
+					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: nok.*', $messagePart),
 					57,
 				],
 				[
-					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: nok', $messagePart),
+					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: nok.*', $messagePart),
 					58,
 				],
 				[
-					'Regex pattern is invalid: Compilation failed: missing closing parenthesis at offset 1 in pattern: ~(~',
+					'Regex pattern is invalid: Compilation failed: missing closing parenthesis at offset 3 in pattern: ~(.*~',
 					59,
 				],
 				[
-					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: noknono', $messagePart),
+					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: nok.*nono', $messagePart),
 					61,
 				],
 				[
-					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: noknope', $messagePart),
+					sprintf('Regex pattern is invalid: Delimiter must not be %s in pattern: nok.*nope', $messagePart),
 					62,
 				],
 				[
-					'Regex pattern is invalid: Compilation failed: missing closing parenthesis at offset 1 in pattern: ~(~',
+					'Regex pattern is invalid: Compilation failed: missing closing parenthesis at offset 3 in pattern: ~(.*~',
 					63,
 				],
 			],

Diff for: tests/PHPStan/Rules/Regexp/data/valid-regex-pattern.php

@@ -62,3 +62,11 @@ function doFoo(string $s) {
 	preg_replace('nok'. preg_quote($s).'nope', '');
 	preg_replace('~('. preg_quote($s, '~') .'~', '');
 }
+
+class Bug11403
+{
+	public function sayHello(string $s): void
+	{
+		preg_replace('![' . preg_quote($s) . ']+!u', $s, $s);
+	}
+}