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

doc/grammars/type.abnf

@@ -41,7 +41,7 @@ CallableTemplate
 	= TokenAngleBracketOpen CallableTemplateArgument *(TokenComma CallableTemplateArgument) TokenAngleBracketClose
 
 CallableTemplateArgument
-    = TokenIdentifier [1*ByteHorizontalWs TokenOf Type]
+    = TokenIdentifier [1*ByteHorizontalWs TokenOf Type] [1*ByteHorizontalWs TokenSuper Type] ["=" Type]
 
 CallableParameters
 	= CallableParameter *(TokenComma CallableParameter)
@@ -201,6 +201,9 @@ TokenNot
 TokenOf
 	= %s"of" 1*ByteHorizontalWs
 
+TokenSuper
+	= %s"super" 1*ByteHorizontalWs
+
 TokenContravariant
     = %s"contravariant" 1*ByteHorizontalWs
 

src/Ast/PhpDoc/TemplateTagValueNode.php

@@ -14,30 +14,34 @@ class TemplateTagValueNode implements PhpDocTagValueNode
 	/** @var non-empty-string */
 	public string $name;
 
-	public ?TypeNode $bound = null;
+	public ?TypeNode $bound;
 
-	public ?TypeNode $default = null;
+	public ?TypeNode $default;
+
+	public ?TypeNode $lowerBound;
 
 	/** @var string (may be empty) */
 	public string $description;
 
 	/**
 	 * @param non-empty-string $name
 	 */
-	public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null)
+	public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null, ?TypeNode $lowerBound = null)
 	{
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->lowerBound = $lowerBound;
 		$this->default = $default;
 		$this->description = $description;
 	}
 
 
 	public function __toString(): string
 	{
-		$bound = $this->bound !== null ? " of {$this->bound}" : '';
+		$upperBound = $this->bound !== null ? " of {$this->bound}" : '';
+		$lowerBound = $this->lowerBound !== null ? " super {$this->lowerBound}" : '';
 		$default = $this->default !== null ? " = {$this->default}" : '';
-		return trim("{$this->name}{$bound}{$default} {$this->description}");
+		return trim("{$this->name}{$upperBound}{$lowerBound}{$default} {$this->description}");
 	}
 
 }

src/Parser/TypeParser.php

@@ -466,11 +466,14 @@ public function parseTemplateTagValue(
 		$name = $tokens->currentTokenValue();
 		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
 
+		$upperBound = $lowerBound = null;
+
 		if ($tokens->tryConsumeTokenValue('of') || $tokens->tryConsumeTokenValue('as')) {
-			$bound = $this->parse($tokens);
+			$upperBound = $this->parse($tokens);
+		}
 
-		} else {
-			$bound = null;
+		if ($tokens->tryConsumeTokenValue('super')) {
+			$lowerBound = $this->parse($tokens);
 		}
 
 		if ($tokens->tryConsumeTokenValue('=')) {
@@ -489,7 +492,7 @@ public function parseTemplateTagValue(
 			throw new LogicException('Template tag name cannot be empty.');
 		}
 
-		return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default);
+		return new Ast\PhpDoc\TemplateTagValueNode($name, $upperBound, $description, $default, $lowerBound);
 	}
 
 

src/Printer/Printer.php

@@ -355,9 +355,10 @@ private function printTagValue(PhpDocTagValueNode $node): string
 			return trim($type . ' ' . $node->description);
 		}
 		if ($node instanceof TemplateTagValueNode) {
-			$bound = $node->bound !== null ? ' of ' . $this->printType($node->bound) : '';
+			$upperBound = $node->bound !== null ? ' of ' . $this->printType($node->bound) : '';
+			$lowerBound = $node->lowerBound !== null ? ' super ' . $this->printType($node->lowerBound) : '';
 			$default = $node->default !== null ? ' = ' . $this->printType($node->default) : '';
-			return trim("{$node->name}{$bound}{$default} {$node->description}");
+			return trim("{$node->name}{$upperBound}{$lowerBound}{$default} {$node->description}");
 		}
 		if ($node instanceof ThrowsTagValueNode) {
 			$type = $this->printType($node->type);

tests/PHPStan/Ast/ToString/PhpDocToStringTest.php

@@ -155,12 +155,15 @@ public static function provideOtherCases(): Generator
 		$baz = new IdentifierTypeNode('Foo\\Baz');
 
 		yield from [
-			['TValue', new TemplateTagValueNode('TValue', null, '', null)],
-			['TValue of Foo\\Bar', new TemplateTagValueNode('TValue', $bar, '', null)],
+			['TValue', new TemplateTagValueNode('TValue', null, '')],
+			['TValue of Foo\\Bar', new TemplateTagValueNode('TValue', $bar, '')],
+			['TValue super Foo\\Bar', new TemplateTagValueNode('TValue', null, '', null, $bar)],
 			['TValue = Foo\\Bar', new TemplateTagValueNode('TValue', null, '', $bar)],
 			['TValue of Foo\\Bar = Foo\\Baz', new TemplateTagValueNode('TValue', $bar, '', $baz)],
-			['TValue Description.', new TemplateTagValueNode('TValue', null, 'Description.', null)],
+			['TValue Description.', new TemplateTagValueNode('TValue', null, 'Description.')],
 			['TValue of Foo\\Bar = Foo\\Baz Description.', new TemplateTagValueNode('TValue', $bar, 'Description.', $baz)],
+			['TValue super Foo\\Bar = Foo\\Baz Description.', new TemplateTagValueNode('TValue', null, 'Description.', $baz, $bar)],
+			['TValue of Foo\\Bar super Foo\\Baz Description.', new TemplateTagValueNode('TValue', $bar, 'Description.', null, $baz)],
 		];
 	}
 

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -4058,7 +4058,7 @@ public function provideTemplateTagsData(): Iterator
 		];
 
 		yield [
-			'OK with bound and description',
+			'OK with upper bound and description',
 			'/** @template T of DateTime the value type */',
 			new PhpDocNode([
 				new PhpDocTagNode(
@@ -4073,22 +4073,41 @@ public function provideTemplateTagsData(): Iterator
 		];
 
 		yield [
-			'OK with bound and description',
-			'/** @template T as DateTime the value type */',
+			'OK with lower bound and description',
+			'/** @template T super DateTimeImmutable the value type */',
 			new PhpDocNode([
 				new PhpDocTagNode(
 					'@template',
 					new TemplateTagValueNode(
 						'T',
-						new IdentifierTypeNode('DateTime'),
+						null,
+						'the value type',
+						null,
+						new IdentifierTypeNode('DateTimeImmutable'),
+					),
+				),
+			]),
+		];
+
+		yield [
+			'OK with both bounds and description',
+			'/** @template T of DateTimeInterface super DateTimeImmutable the value type */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@template',
+					new TemplateTagValueNode(
+						'T',
+						new IdentifierTypeNode('DateTimeInterface'),
 						'the value type',
+						null,
+						new IdentifierTypeNode('DateTimeImmutable'),
 					),
 				),
 			]),
 		];
 
 		yield [
-			'invalid without bound and description',
+			'invalid without bounds and description',
 			'/** @template */',
 			new PhpDocNode([
 				new PhpDocTagNode(

tests/PHPStan/Printer/PrinterTest.php

@@ -943,6 +943,12 @@ public function enterNode(Node $node)
 			$addTemplateTagBound,
 		];
 
+		yield [
+			'/** @template T super string */',
+			'/** @template T of int super string */',
+			$addTemplateTagBound,
+		];
+
 		$removeTemplateTagBound = new class extends AbstractNodeVisitor {
 
 			public function enterNode(Node $node)
@@ -962,6 +968,56 @@ public function enterNode(Node $node)
 			$removeTemplateTagBound,
 		];
 
+		$addTemplateTagLowerBound = new class extends AbstractNodeVisitor {
+
+			public function enterNode(Node $node)
+			{
+				if ($node instanceof TemplateTagValueNode) {
+					$node->lowerBound = new IdentifierTypeNode('int');
+				}
+
+				return $node;
+			}
+
+		};
+
+		yield [
+			'/** @template T */',
+			'/** @template T super int */',
+			$addTemplateTagLowerBound,
+		];
+
+		yield [
+			'/** @template T super string */',
+			'/** @template T super int */',
+			$addTemplateTagLowerBound,
+		];
+
+		yield [
+			'/** @template T of string */',
+			'/** @template T of string super int */',
+			$addTemplateTagLowerBound,
+		];
+
+		$removeTemplateTagLowerBound = new class extends AbstractNodeVisitor {
+
+			public function enterNode(Node $node)
+			{
+				if ($node instanceof TemplateTagValueNode) {
+					$node->lowerBound = null;
+				}
+
+				return $node;
+			}
+
+		};
+
+		yield [
+			'/** @template T super int */',
+			'/** @template T */',
+			$removeTemplateTagLowerBound,
+		];
+
 		$addKeyNameToArrayShapeItemNode = new class extends AbstractNodeVisitor {
 
 			public function enterNode(Node $node)