Introduce uppercase-string

conf/config.neon

@@ -1564,6 +1564,11 @@ services:
 tags:
 - phpstan.dynamicFunctionThrowTypeExtension
 
+-
+class: PHPStan\Type\Php\ParseStrParameterOutTypeExtension
+tags:
+- phpstan.functionParameterOutTypeExtension
+
 -
 class: PHPStan\Type\Php\PregMatchTypeSpecifyingExtension
 tags:
@@ -1774,6 +1779,11 @@ services:
 tags:
 - phpstan.broker.dynamicFunctionReturnTypeExtension
 
+-
+class: PHPStan\Type\Php\TrimFunctionDynamicReturnTypeExtension
+tags:
+- phpstan.broker.dynamicFunctionReturnTypeExtension
+
 -
 class: PHPStan\Type\Php\VersionCompareFunctionDynamicReturnTypeExtension
 tags:

phpstan-baseline.neon

@@ -715,6 +715,11 @@ parameters:
 count: 1
 path: src/Type/Accessory/AccessoryNumericStringType.php
 
+-
+message: "#^Doing instanceof PHPStan\\\\Type\\\\IntersectionType is error\\-prone and deprecated\\.$#"
+count: 1
+path: src/Type/Accessory/AccessoryUppercaseStringType.php
+
 -
 message: "#^Doing instanceof PHPStan\\\\Type\\\\IntersectionType is error\\-prone and deprecated\\.$#"
 count: 1

resources/functionMap.php

@@ -6362,7 +6362,7 @@
 'mb_strrpos' => ['0|positive-int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
 'mb_strstr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'part='=>'bool', 'encoding='=>'string'],
 'mb_strtolower' => ['lowercase-string', 'str'=>'string', 'encoding='=>'string'],
-'mb_strtoupper' => ['string', 'str'=>'string', 'encoding='=>'string'],
+'mb_strtoupper' => ['uppercase-string', 'str'=>'string', 'encoding='=>'string'],
 'mb_strwidth' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'],
 'mb_substitute_character' => ['mixed', 'substchar='=>'mixed'],
 'mb_substr' => ['string', 'str'=>'string', 'start'=>'int', 'length='=>'?int', 'encoding='=>'string'],
@@ -12087,7 +12087,7 @@
 'strtok\'1' => ['non-empty-string|false', 'token'=>'string'],
 'strtolower' => ['lowercase-string', 'str'=>'string'],
 'strtotime' => ['int|false', 'time'=>'string', 'now='=>'int'],
-'strtoupper' => ['string', 'str'=>'string'],
+'strtoupper' => ['uppercase-string', 'str'=>'string'],
 'strtr' => ['string', 'str'=>'string', 'from'=>'string', 'to'=>'string'],
 'strtr\'1' => ['string', 'str'=>'string', 'replace_pairs'=>'array'],
 'strval' => ['string', 'var'=>'__stringAndStringable|int|float|bool|resource|null'],

src/PhpDoc/TypeNodeResolver.php

@@ -50,6 +50,7 @@
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BenevolentUnionType;
@@ -223,6 +224,9 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 case 'lowercase-string':
 return new IntersectionType([new StringType(), new AccessoryLowercaseStringType()]);
 
+case 'uppercase-string':
+return new IntersectionType([new StringType(), new AccessoryUppercaseStringType()]);
+
 case 'literal-string':
 return new IntersectionType([new StringType(), new AccessoryLiteralStringType()]);
 
@@ -303,6 +307,13 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 new AccessoryLowercaseStringType(),
 ]);
 
+case 'non-empty-uppercase-string':
+return new IntersectionType([
+new StringType(),
+new AccessoryNonEmptyStringType(),
+new AccessoryUppercaseStringType(),
+]);
+
 case 'truthy-string':
 case 'non-falsy-string':
 return new IntersectionType([

src/Reflection/InitializerExprTypeResolver.php

@@ -31,6 +31,7 @@
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BenevolentUnionType;
@@ -480,10 +481,15 @@ public function resolveConcatType(Type $left, Type $right): Type
 if ($leftStringType->isLiteralString()->and($rightStringType->isLiteralString())->yes()) {
 $accessoryTypes[] = new AccessoryLiteralStringType();
 }
+
 if ($leftStringType->isLowercaseString()->and($rightStringType->isLowercaseString())->yes()) {
 $accessoryTypes[] = new AccessoryLowercaseStringType();
 }
 
+if ($leftStringType->isUppercaseString()->and($rightStringType->isUppercaseString())->yes()) {
+$accessoryTypes[] = new AccessoryUppercaseStringType();
+}
+
 $leftNumericStringNonEmpty = TypeCombinator::remove($leftStringType, new ConstantStringType(''));
 if ($leftNumericStringNonEmpty->isNumericString()->yes()) {
 $allRightConstantsZeroOrMore = false;

src/Rules/Api/ApiInstanceofTypeRule.php

@@ -16,6 +16,7 @@
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Accessory\AccessoryType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Accessory\HasMethodType;
 use PHPStan\Type\Accessory\HasOffsetType;
 use PHPStan\Type\Accessory\HasPropertyType;
@@ -86,6 +87,7 @@ final class ApiInstanceofTypeRule implements Rule
 AccessoryNumericStringType::class => 'Type::isNumericString()',
 AccessoryLiteralStringType::class => 'Type::isLiteralString()',
 AccessoryLowercaseStringType::class => 'Type::isLowercaseString()',
+AccessoryUppercaseStringType::class => 'Type::isUppercaseString()',
 AccessoryNonEmptyStringType::class => 'Type::isNonEmptyString()',
 AccessoryNonFalsyStringType::class => 'Type::isNonFalsyString()',
 HasMethodType::class => 'Type::hasMethod()',

src/Rules/Comparison/StrictComparisonOfDifferentTypesRule.php

@@ -75,19 +75,26 @@ public function processNode(Node $node, Scope $scope): array
 };
 
 $verbosity = VerbosityLevel::value();
+
 if (
 (
 $leftType->isConstantScalarValue()->yes()
 && !$leftType->isString()->no()
 && !$rightType->isConstantScalarValue()->yes()
 && !$rightType->isString()->no()
-&& TrinaryLogic::extremeIdentity($leftType->isLowercaseString(), $rightType->isLowercaseString())->maybe()
+&& (
+TrinaryLogic::extremeIdentity($leftType->isLowercaseString(), $rightType->isLowercaseString())->maybe()
+|| TrinaryLogic::extremeIdentity($leftType->isUppercaseString(), $rightType->isUppercaseString())->maybe()
+)
 ) || (
 $rightType->isConstantScalarValue()->yes()
 && !$rightType->isString()->no()
 && !$leftType->isConstantScalarValue()->yes()
 && !$leftType->isString()->no()
-&& TrinaryLogic::extremeIdentity($leftType->isLowercaseString(), $rightType->isLowercaseString())->maybe()
+&& (
+TrinaryLogic::extremeIdentity($leftType->isLowercaseString(), $rightType->isLowercaseString())->maybe()
+|| TrinaryLogic::extremeIdentity($leftType->isUppercaseString(), $rightType->isUppercaseString())->maybe()
+)
 )
 ) {
 $verbosity = VerbosityLevel::precise();

src/Type/Accessory/AccessoryArrayListType.php

@@ -414,6 +414,11 @@ public function isLowercaseString(): TrinaryLogic
 return TrinaryLogic::createNo();
 }
 
+public function isUppercaseString(): TrinaryLogic
+{
+return TrinaryLogic::createNo();
+}
+
 public function isClassStringType(): TrinaryLogic
 {
 return TrinaryLogic::createNo();

src/Type/Accessory/AccessoryLiteralStringType.php

@@ -313,6 +313,11 @@ public function isLowercaseString(): TrinaryLogic
 return TrinaryLogic::createMaybe();
 }
 
+public function isUppercaseString(): TrinaryLogic
+{
+return TrinaryLogic::createMaybe();
+}
+
 public function isClassStringType(): TrinaryLogic
 {
 return TrinaryLogic::createMaybe();

src/Type/Accessory/AccessoryLowercaseStringType.php

@@ -309,6 +309,11 @@ public function isLowercaseString(): TrinaryLogic
 return TrinaryLogic::createYes();
 }
 
+public function isUppercaseString(): TrinaryLogic
+{
+return TrinaryLogic::createMaybe();
+}
+
 public function isClassStringType(): TrinaryLogic
 {
 return TrinaryLogic::createMaybe();

src/Type/Accessory/AccessoryNonEmptyStringType.php

@@ -310,6 +310,11 @@ public function isLowercaseString(): TrinaryLogic
 return TrinaryLogic::createMaybe();
 }
 
+public function isUppercaseString(): TrinaryLogic
+{
+return TrinaryLogic::createMaybe();
+}
+
 public function isClassStringType(): TrinaryLogic
 {
 return TrinaryLogic::createMaybe();

src/Type/Accessory/AccessoryNonFalsyStringType.php

@@ -310,6 +310,11 @@ public function isLowercaseString(): TrinaryLogic
 return TrinaryLogic::createMaybe();
 }
 
+public function isUppercaseString(): TrinaryLogic
+{
+return TrinaryLogic::createMaybe();
+}
+
 public function isClassStringType(): TrinaryLogic
 {
 return TrinaryLogic::createMaybe();

src/Type/Accessory/AccessoryNumericStringType.php

@@ -312,6 +312,11 @@ public function isLowercaseString(): TrinaryLogic
 return TrinaryLogic::createMaybe();
 }
 
+public function isUppercaseString(): TrinaryLogic
+{
+return TrinaryLogic::createMaybe();
+}
+
 public function isClassStringType(): TrinaryLogic
 {
 return TrinaryLogic::createNo();