Backward compatibility - QuoteAwareConstExprStringNode should extend …

…ConstExprStringNode
phpstan · Apr 17, 2023 · 178b33a · 178b33a
1 parent 5194589
commit 178b33a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php b/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php
@@ -13,17 +13,14 @@
 use function strlen;
 use const STR_PAD_LEFT;
 
-class QuoteAwareConstExprStringNode implements ConstExprNode
+class QuoteAwareConstExprStringNode extends ConstExprStringNode implements ConstExprNode
 {
 
 	public const SINGLE_QUOTED = 1;
 	public const DOUBLE_QUOTED = 2;
 
 	use NodeAttributes;
 
-	/** @var string */
-	public $value;
-
 	/** @var self::SINGLE_QUOTED|self::DOUBLE_QUOTED */
 	public $quoteType;
 
@@ -32,7 +29,7 @@ class QuoteAwareConstExprStringNode implements ConstExprNode
 	 */
 	public function __construct(string $value, int $quoteType)
 	{
-		$this->value = $value;
+		parent::__construct($value);
 		$this->quoteType = $quoteType;
 	}
 

diff --git a/src/Ast/Type/ArrayShapeItemNode.php b/src/Ast/Type/ArrayShapeItemNode.php
@@ -4,7 +4,6 @@
 
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
-use PHPStan\PhpDocParser\Ast\ConstExpr\QuoteAwareConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\NodeAttributes;
 use function sprintf;
 
@@ -13,7 +12,7 @@ class ArrayShapeItemNode implements TypeNode
 
 	use NodeAttributes;
 
-	/** @var ConstExprIntegerNode|QuoteAwareConstExprStringNode|ConstExprStringNode|IdentifierTypeNode|null */
+	/** @var ConstExprIntegerNode|ConstExprStringNode|IdentifierTypeNode|null */
 	public $keyName;
 
 	/** @var bool */
@@ -23,7 +22,7 @@ class ArrayShapeItemNode implements TypeNode
 	public $valueType;
 
 	/**
-	 * @param ConstExprIntegerNode|QuoteAwareConstExprStringNode|ConstExprStringNode|IdentifierTypeNode|null $keyName
+	 * @param ConstExprIntegerNode|ConstExprStringNode|IdentifierTypeNode|null $keyName
 	 */
 	public function __construct($keyName, bool $optional, TypeNode $valueType)
 	{

diff --git a/src/Ast/Type/ObjectShapeItemNode.php b/src/Ast/Type/ObjectShapeItemNode.php
@@ -3,7 +3,6 @@
 namespace PHPStan\PhpDocParser\Ast\Type;
 
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
-use PHPStan\PhpDocParser\Ast\ConstExpr\QuoteAwareConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\NodeAttributes;
 use function sprintf;
 
@@ -12,7 +11,7 @@ class ObjectShapeItemNode implements TypeNode
 
 	use NodeAttributes;
 
-	/** @var QuoteAwareConstExprStringNode|ConstExprStringNode|IdentifierTypeNode */
+	/** @var ConstExprStringNode|IdentifierTypeNode */
 	public $keyName;
 
 	/** @var bool */
@@ -22,7 +21,7 @@ class ObjectShapeItemNode implements TypeNode
 	public $valueType;
 
 	/**
-	 * @param QuoteAwareConstExprStringNode|ConstExprStringNode|IdentifierTypeNode $keyName
+	 * @param ConstExprStringNode|IdentifierTypeNode $keyName
 	 */
 	public function __construct($keyName, bool $optional, TypeNode $valueType)
 	{

diff --git a/src/Parser/TypeParser.php b/src/Parser/TypeParser.php
@@ -566,7 +566,7 @@ private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShape
 
 	/**
 	 * @phpstan-impure
-	 * @return Ast\ConstExpr\ConstExprIntegerNode|Ast\ConstExpr\QuoteAwareConstExprStringNode|Ast\ConstExpr\ConstExprStringNode|Ast\Type\IdentifierTypeNode
+	 * @return Ast\ConstExpr\ConstExprIntegerNode|Ast\ConstExpr\ConstExprStringNode|Ast\Type\IdentifierTypeNode
 	 */
 	private function parseArrayShapeKey(TokenIterator $tokens)
 	{
@@ -639,7 +639,7 @@ private function parseObjectShapeItem(TokenIterator $tokens): Ast\Type\ObjectSha
 
 	/**
 	 * @phpstan-impure
-	 * @return Ast\ConstExpr\QuoteAwareConstExprStringNode|Ast\ConstExpr\ConstExprStringNode|Ast\Type\IdentifierTypeNode
+	 * @return Ast\ConstExpr\ConstExprStringNode|Ast\Type\IdentifierTypeNode
 	 */
 	private function parseObjectShapeKey(TokenIterator $tokens)
 	{