Extractor: supports file comment extraction with singleline declare

Author: dg

src/PhpGenerator/Extractor.php

@@ -237,11 +237,18 @@ public function extractAll(): PhpFile
 		$phpFile = new PhpFile;
 
 		if (
-			$this->statements
-			&& !$this->statements[0] instanceof Node\Stmt\ClassLike
-			&& !$this->statements[0] instanceof Node\Stmt\Function_
+			($firstStmt = $this->statements[0] ?? null)
+			&& ($firstStmt = $firstStmt instanceof Node\Stmt\Declare_ ? $this->statements[1] ?? null : $firstStmt)
+			&& !$firstStmt instanceof Node\Stmt\ClassLike
+			&& !$firstStmt instanceof Node\Stmt\Function_
 		) {
-			$this->addCommentAndAttributes($phpFile, $this->statements[0]);
+			$comments = $firstStmt->getComments();
+			foreach ($comments as $i => $comment) {
+				if ($comment instanceof PhpParser\Comment\Doc) {
+					$phpFile->setComment(Helpers::unformatDocComment($comment->getReformattedText()));
+					break;
+				}
+			}
 		}
 
 		$namespaces = ['' => $this->statements];
@@ -437,7 +444,7 @@ private function addFunctionToFile(PhpFile $phpFile, Node\Stmt\Function_ $node):
 
 
 	private function addCommentAndAttributes(
-		PhpFile|ClassLike|Constant|Property|GlobalFunction|Method|Parameter|EnumCase|TraitUse|PropertyHook $element,
+		ClassLike|Constant|Property|GlobalFunction|Method|Parameter|EnumCase|TraitUse|PropertyHook $element,
 		Node $node,
 	): void
 	{

tests/PhpGenerator/ClassManipulator.implement.84.phpt

@@ -26,7 +26,9 @@ abstract class ParentAbstract
 	abstract public array $abstractProperty { get; }
 	public array $concreteProperty;
 	abstract public function abstractMethod();
-	public function concreteMethod() {}
+	public function concreteMethod()
+	{
+	}
 }
 
 abstract class TestAbstract extends ParentAbstract

tests/PhpGenerator/ClassType.from.85.phpt

@@ -5,7 +5,6 @@
  */
 
 use Nette\PhpGenerator\ClassType;
-use Nette\PhpGenerator\InterfaceType;
 
 require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/fixtures/classes.85.php';

tests/PhpGenerator/Extractor.extractAll.file.comments.phpt

@@ -19,6 +19,17 @@ Assert::null($file->getComment());
 Assert::same('doc comment', $file->getClasses()['Class1']->getComment());
 
 
+$file = (new Extractor(<<<'XX'
+	<?php declare(strict_types=1);
+
+	/** doc comment */
+
+	namespace Abc;
+	XX))->extractAll();
+
+Assert::same('doc comment', $file->getComment());
+
+
 $file = (new Extractor(<<<'XX'
 	<?php
 

tests/PhpGenerator/fixtures/classes.php

@@ -1,11 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * First comment
  */
 
-declare(strict_types=1);
-
 /**
  * Second comment
  */