Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

build/baseline-8.0.neon

@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#"
+			message: "#^Strict comparison using \\=\\=\\= between list<callable\\(string\\): void> and false will always evaluate to false\\.$#"
 			count: 1
 			path: ../src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php
 

build/spl-autoload-functions-php-8.neon

@@ -1,6 +1,6 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^PHPDoc tag @var with type array\\<callable\\>\\|false is not subtype of native type array\\.$#"
+			message: "#^PHPDoc tag @var with type list\\<callable\\(string\\): void\\>\\|false is not subtype of native type list\\<callable\\(string\\): void\\>\\.$#"
 			count: 2
 			path: ../src/Command/CommandHelper.php

build/spl-autoload-functions-pre-php-7.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^PHPDoc tag @var with type array\\<callable\\(\\)\\: mixed\\>\\|false is not subtype of native type list\\<callable\\(string\\)\\: void\\>\\|false\\.$#"
-			count: 2
-			path: ../src/Command/CommandHelper.php
-
 		-
 			message: '#^Parameter \#1 \$array \(list<PHPStan\\Type\\Type>\) of array_values is already a list, call has no effect\.$#'
 			path: ../src/Type/TypeCombinator.php

phpstan-baseline.neon

@@ -882,7 +882,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantArrayType is error\-prone and deprecated\. Use Type\:\:getConstantArrays\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 7
+			count: 9
 			path: src/Type/Constant/ConstantArrayType.php
 
 		-

resources/RegexGrammar.pp

@@ -42,14 +42,16 @@
 //
 
 // Character classes.
+// tokens suffixed with "fc_" are the same as without such suffix but followed by "class:_class"
+%token  negative_class_fc_       \[\^(?=\])         -> class_fc
+%token  class_fc_                \[(?=\])           -> class_fc
+%token class_fc:_class           \]                 -> class
 %token  negative_class_          \[\^               -> class
 %token  class_                   \[                 -> class
 %token class:posix_class         \[:\^?[a-z]+:\]
 %token class:class_              \[
-%token class:_class_literal      (?<=[^\\]\[|[^\\]\[\^)\]
 %token class:_class              \]                 -> default
 %token class:range               \-
-%token class:escaped_end_class   \\\]
 // taken over from literals but class:character has \b support on top (backspace in character classes)
 %token class:character           \\([aefnrtb]|c[\x00-\x7f])
 %token class:dynamic_character   \\([0-7]{3}|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+})
@@ -58,7 +60,8 @@
 
 // Internal options.
 // See https://www.regular-expressions.info/refmodifiers.html
-%token  internal_option          \(\?([imsxnJUX^]|xx)?-?([imsxnJUX^]|xx)\)
+// and https://www.php.net/manual/en/regexp.reference.internal-options.php
+%token  internal_option          \(\?[imsxnJUX^]*-?[imsxnJUX^]+\)
 
 // Lookahead and lookbehind assertions.
 %token  lookahead_               \(\?=
@@ -88,7 +91,7 @@
 %token  nc:_named_capturing      >                  -> default
 %token  nc:capturing_name        .+?(?=(?<!\\)>)
 %token  non_capturing_           \(\?:
-%token  non_capturing_internal_option \(\?([imsxnJUX^]|xx)?-?([imsxnJUX^]|xx):
+%token  non_capturing_internal_option \(\?[imsxnJUX^]*-?[imsxnJUX^]+:
 %token  non_capturing_reset_     \(\?\|
 %token  atomic_group_            \(\?>
 %token  capturing_               \(
@@ -177,10 +180,14 @@
 
 #class:
     (
-        ::negative_class_:: #negativeclass
+        ::negative_class_fc_:: #negativeclass
+        <_class>
+      | ::class_fc_::
+        <_class>
+      | ::negative_class_:: #negativeclass
       | ::class_::
     )
-    ( <range> | <_class_literal> )? ( <posix_class> | <class_> | range() | literal() | <escaped_end_class> )* <range>?
+    <range>? ( <posix_class> | <class_> | range() <range>? | literal() )* <range>?
     ::_class::
 
 #range:

resources/functionMap.php

@@ -1497,7 +1497,7 @@
 'curl_multi_close' => ['void', 'mh'=>'resource'],
 'curl_multi_errno' => ['int', 'mh'=>'resource'],
 'curl_multi_exec' => ['int', 'mh'=>'resource', '&w_still_running'=>'int'],
-'curl_multi_getcontent' => ['string', 'ch'=>'resource'],
+'curl_multi_getcontent' => ['string|null', 'ch'=>'resource'],
 'curl_multi_info_read' => ['array|false', 'mh'=>'resource', '&w_msgs_in_queue='=>'int'],
 'curl_multi_init' => ['resource'],
 'curl_multi_remove_handle' => ['int', 'mh'=>'resource', 'ch'=>'resource'],
@@ -11556,7 +11556,7 @@
 'SplFileInfo::getMTime' => ['__benevolent<int|false>'],
 'SplFileInfo::getOwner' => ['__benevolent<int|false>'],
 'SplFileInfo::getPath' => ['string'],
-'SplFileInfo::getPathInfo' => ['SplFileInfo', 'class_name='=>'string'],
+'SplFileInfo::getPathInfo' => ['__benevolent<SplFileInfo|null>', 'class_name='=>'string'],
 'SplFileInfo::getPathname' => ['string'],
 'SplFileInfo::getPerms' => ['__benevolent<int|false>'],
 'SplFileInfo::getRealPath' => ['__benevolent<string|false>'],
@@ -12606,7 +12606,7 @@
 'timezone_version_get' => ['string'],
 'tmpfile' => ['__benevolent<resource|false>'],
 'token_get_all' => ['list<string|array{0:int,1:string,2:int}>', 'source'=>'string', 'flags='=>'int'],
-'token_name' => ['string', 'type'=>'int'],
+'token_name' => ['non-empty-string', 'type'=>'int'],
 'TokyoTyrant::__construct' => ['void', 'host='=>'string', 'port='=>'int', 'options='=>'array'],
 'TokyoTyrant::add' => ['int|float', 'key'=>'string', 'increment'=>'float', 'type='=>'int'],
 'TokyoTyrant::connect' => ['TokyoTyrant', 'host'=>'string', 'port='=>'int', 'options='=>'array'],

resources/functionMap_php80delta.php

@@ -102,6 +102,7 @@
 		'socket_addrinfo_lookup' => ['AddressInfo[]', 'node'=>'string', 'service='=>'mixed', 'hints='=>'array'],
 		'socket_select' => ['int|false', '&w_read'=>'Socket[]|null', '&w_write'=>'Socket[]|null', '&w_except'=>'Socket[]|null', 'seconds'=>'int|null', 'microseconds='=>'int'],
 		'sodium_crypto_aead_chacha20poly1305_ietf_decrypt' => ['string|false', 'confidential_message'=>'string', 'public_message'=>'string', 'nonce'=>'string', 'key'=>'string'],
+		'spl_autoload_functions' => ['list<callable(string):void>'],
 		'str_contains' => ['bool', 'haystack'=>'string', 'needle'=>'string'],
 		'str_split' => ['non-empty-list<string>', 'str'=>'string', 'split_length='=>'positive-int'],
 		'str_ends_with' => ['bool', 'haystack'=>'string', 'needle'=>'string'],

src/Command/CommandHelper.php

@@ -163,7 +163,7 @@ public static function begin(
 		$currentWorkingDirectoryFileHelper = new FileHelper($currentWorkingDirectory);
 		$currentWorkingDirectory = $currentWorkingDirectoryFileHelper->getWorkingDirectory();
 
-		/** @var array<callable>|false $autoloadFunctionsBefore */
+		/** @var list<callable(string): void>|false $autoloadFunctionsBefore */
 		$autoloadFunctionsBefore = spl_autoload_functions();
 
 		if ($autoloadFile !== null) {
@@ -458,7 +458,7 @@ public static function begin(
 			self::executeBootstrapFile($bootstrapFileFromArray, $container, $errorOutput, $debugEnabled);
 		}
 
-		/** @var array<callable>|false $autoloadFunctionsAfter */
+		/** @var list<callable(string): void>|false $autoloadFunctionsAfter */
 		$autoloadFunctionsAfter = spl_autoload_functions();
 
 		if ($autoloadFunctionsBefore !== false && $autoloadFunctionsAfter !== false) {

src/Rules/DeadCode/UnusedPrivateMethodRule.php

@@ -84,7 +84,16 @@ public function processNode(Node $node, Scope $scope): array
 				$methodNameType = $callScope->getType($methodCallNode->name);
 				$strings = $methodNameType->getConstantStrings();
 				if (count($strings) === 0) {
-					return [];
+					// handle subtractions of a dynamic method call
+					foreach ($methods as $lowerMethodName => $method) {
+						if ((new ConstantStringType($method->getNode()->name->toString()))->isSuperTypeOf($methodNameType)->no()) {
+							continue;
+						}
+
+						unset($methods[$lowerMethodName]);
+					}
+
+					continue;
 				}
 
 				$methodNames = array_map(static fn (ConstantStringType $type): string => $type->getValue(), $strings);

src/Rules/DeadCode/UnusedPrivatePropertyRule.php

@@ -120,7 +120,16 @@ public function processNode(Node $node, Scope $scope): array
 				$propertyNameType = $usage->getScope()->getType($fetch->name);
 				$strings = $propertyNameType->getConstantStrings();
 				if (count($strings) === 0) {
-					return [];
+					// handle subtractions of a dynamic property fetch
+					foreach ($properties as $propertyName => $data) {
+						if ((new ConstantStringType($propertyName))->isSuperTypeOf($propertyNameType)->no()) {
+							continue;
+						}
+
+						unset($properties[$propertyName]);
+					}
+
+					continue;
 				}
 
 				$propertyNames = array_map(static fn (ConstantStringType $type): string => $type->getValue(), $strings);