Ast: NamedType - added support for 'static' keyword (PHP 8.0+)

czproject · Mar 19, 2024 · b605fb5 · b605fb5
1 parent d4ffa4e
commit b605fb5
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 0 deletions.
diff --git a/src/Ast/NamedType.php b/src/Ast/NamedType.php
@@ -73,6 +73,9 @@ public static function parse(NodeParser $parser)
 			} elseif ($parser->isCurrent(T_CALLABLE)) {
 				$type = $parser->consumeTokenAsText(T_CALLABLE);
 
+			} elseif ($parser->isCurrent(T_STATIC)) {
+				$type = $parser->consumeTokenAsText(T_STATIC);
+
 			} else {
 				$name = Name::parse($parser->createSubParser());
 				$type = $name->toString();

diff --git a/tests/PhpSimpleAst/fixtures/PHP-8.0/80000.static-return-type.dump b/tests/PhpSimpleAst/fixtures/PHP-8.0/80000.static-return-type.dump
@@ -0,0 +1,66 @@
+CzProject\PhpSimpleAst\Ast\PhpString
+   children: array (1)
+   |  0 => CzProject\PhpSimpleAst\Ast\PhpNode
+   |  |  openTag: '<?php\n'
+   |  |  children: array (2)
+   |  |  |  0 => CzProject\PhpSimpleAst\Ast\ClassNode
+   |  |  |  |  indentation: '\n'
+   |  |  |  |  keyword: 'class'
+   |  |  |  |  name: CzProject\PhpSimpleAst\Ast\Name
+   |  |  |  |  |  indentation: ' '
+   |  |  |  |  |  name: 'Foo'
+   |  |  |  |  constructorValues: null
+   |  |  |  |  extends: null
+   |  |  |  |  implements: null
+   |  |  |  |  blockOpener: ' {'
+   |  |  |  |  children: array (1)
+   |  |  |  |  |  0 => CzProject\PhpSimpleAst\Ast\MethodNode
+   |  |  |  |  |  |  phpDocNode: null
+   |  |  |  |  |  |  indentation: string
+   |  |  |  |  |  |  |  '\n
+   |  |  |  |  |  |  |   \t    '
+   |  |  |  |  |  |  modifiers: array (2)
+   |  |  |  |  |  |  |  0 => CzProject\PhpSimpleAst\Ast\Visibility
+   |  |  |  |  |  |  |  |  indentation: ''
+   |  |  |  |  |  |  |  |  visibility: 'public'
+   |  |  |  |  |  |  |  1 => CzProject\PhpSimpleAst\Ast\StaticModifier
+   |  |  |  |  |  |  |  |  indentation: ' '
+   |  |  |  |  |  |  |  |  modifier: 'static'
+   |  |  |  |  |  |  keywordPrefix: ' '
+   |  |  |  |  |  |  keyword: 'function'
+   |  |  |  |  |  |  name: CzProject\PhpSimpleAst\Ast\Name
+   |  |  |  |  |  |  |  indentation: ' '
+   |  |  |  |  |  |  |  name: 'getInstance'
+   |  |  |  |  |  |  parameters: CzProject\PhpSimpleAst\Ast\Parameters
+   |  |  |  |  |  |  |  indentation: ''
+   |  |  |  |  |  |  |  opener: '('
+   |  |  |  |  |  |  |  parameters: array (0)
+   |  |  |  |  |  |  |  closer: ')'
+   |  |  |  |  |  |  returnType: CzProject\PhpSimpleAst\Ast\FunctionReturnType
+   |  |  |  |  |  |  |  indentation: ': '
+   |  |  |  |  |  |  |  nullable: false
+   |  |  |  |  |  |  |  type: CzProject\PhpSimpleAst\Ast\Type
+   |  |  |  |  |  |  |  |  indentation: ''
+   |  |  |  |  |  |  |  |  types: array (1)
+   |  |  |  |  |  |  |  |  |  0 => CzProject\PhpSimpleAst\Ast\NamedType
+   |  |  |  |  |  |  |  |  |  |  indentation: ''
+   |  |  |  |  |  |  |  |  |  |  nullableSign: ''
+   |  |  |  |  |  |  |  |  |  |  typeIndentation: ''
+   |  |  |  |  |  |  |  |  |  |  type: 'static'
+   |  |  |  |  |  |  body: CzProject\PhpSimpleAst\Ast\FunctionBody
+   |  |  |  |  |  |  |  indentation: ' '
+   |  |  |  |  |  |  |  blockOpener: '{'
+   |  |  |  |  |  |  |  children: array (1)
+   |  |  |  |  |  |  |  |  0 => CzProject\PhpSimpleAst\Ast\UnknowNode
+   |  |  |  |  |  |  |  |  |  content: string
+   |  |  |  |  |  |  |  |  |  |  '\n
+   |  |  |  |  |  |  |  |  |  |   \t    \t    return new static();'
+   |  |  |  |  |  |  |  blockCloser: string
+   |  |  |  |  |  |  |  |  '\n
+   |  |  |  |  |  |  |  |   \t    }'
+   |  |  |  |  blockCloser: string
+   |  |  |  |  |  '\n
+   |  |  |  |  |   }'
+   |  |  |  1 => CzProject\PhpSimpleAst\Ast\UnknowNode
+   |  |  |  |  content: '\n'
+   |  |  closeTag: null
diff --git a/tests/PhpSimpleAst/fixtures/PHP-8.0/80000.static-return-type.php b/tests/PhpSimpleAst/fixtures/PHP-8.0/80000.static-return-type.php
@@ -0,0 +1,7 @@
+<?php
+
+class Foo {
+	public static function getInstance(): static {
+		return new static();
+	}
+}