Fetch comments from ignored elements

To detect file level docblocks get the comments from the ignored tags as well.

refs phpDocumentor/phpDocumentor#3190

Author: jaapio

src/phpDocumentor/Reflection/Php/Factory/File.php

@@ -33,9 +33,9 @@
 use PhpParser\Node\Stmt\Interface_ as InterfaceNode;
 use PhpParser\Node\Stmt\Trait_ as TraitNode;
 
+use function array_merge;
 use function get_class;
 use function in_array;
-use function is_array;
 
 /**
  * Strategy to create File element from the provided filename.
@@ -144,19 +144,22 @@ protected function createFileDocBlock(
         array $nodes = []
     ): ?DocBlockInstance {
         $node = null;
+        $comments = [];
         foreach ($nodes as $n) {
             if (!in_array(get_class($n), self::SKIPPED_NODE_TYPES)) {
                 $node = $n;
                 break;
             }
+
+            $comments = array_merge($comments, $n->getAttribute('comments', []));
         }
 
         if (!$node instanceof Node) {
             return null;
         }
 
-        $comments = $node->getAttribute('comments');
-        if (!is_array($comments) || empty($comments)) {
+        $comments = array_merge($comments, $node->getAttribute('comments', []));
+        if (empty($comments)) {
             return null;
         }
 

tests/integration/FileDocblockTest.php

@@ -43,6 +43,8 @@ public function fileProvider() : array
             [ __DIR__ . '/data/GlobalFiles/empty.php' ],
             [ __DIR__ . '/data/GlobalFiles/empty_with_declare.php' ],
             [ __DIR__ . '/data/GlobalFiles/empty_shebang.php' ],
+            [ __DIR__ . '/data/GlobalFiles/psr12.php' ],
+            [ __DIR__ . '/data/GlobalFiles/docblock_followed_by_html.php' ],
         ];
     }
 

tests/integration/data/GlobalFiles/docblock_followed_by_html.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @copyright 2015-2018 Mike van Riel<[email protected]>
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      http://phpdoc.org
+ */
+?>
+<h1>Test</h1>
+<?php
+
+require 'Pizza.php';

tests/integration/data/GlobalFiles/psr12.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @copyright 2015-2018 Mike van Riel<[email protected]>
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      http://phpdoc.org
+ */
+
+declare(strict_types=1);
+
+require 'Pizza.php';