Core: Fix loading files from include path

Author: SMillerDev

build/binary-phar-autoload.php.in

@@ -1,9 +1,8 @@
-#!/usr/bin/env php
 <?php
-if (version_compare('5.6.0', PHP_VERSION, '>')) {
+if (version_compare('7.1.0', PHP_VERSION, '>')) {
     fwrite(
         STDERR,
-        'This version of PHPDraft requires PHP 5.6; using the latest version of PHP is highly recommended.' . PHP_EOL
+        'This version of PHPDraft requires PHP 7.1; using the latest version of PHP is highly recommended.' . PHP_EOL
     );
 
     die(1);

phpdraft

@@ -1,3 +1,5 @@
+#!/usr/bin/env php
+
 <?php
 /**
  * Set up include path for source handling

src/PHPDraft/In/ApibFileParser.php

@@ -67,13 +67,13 @@ public function parse()
      */
     private function get_apib($filename)
     {
-        $this->file_check($filename);
-        $file    = file_get_contents($filename);
+        $path    = $this->file_path($filename);
+        $file    = file_get_contents($path);
         $matches = [];
-        preg_match_all('<!-- include\(([a-z0-9_.\/]*?)(\.[a-z]*?)\) -->', $file, $matches);
+        preg_match_all('<!-- include\(([\S\s]*?)(\.[a-z]*?)\) -->', $file, $matches);
         for ($i = 0; $i < count($matches[1]); $i++) {
             $file = str_replace('<!-- include(' . $matches[1][$i] . $matches[2][$i] . ') -->',
-                $this->get_apib($this->location . $matches[1][$i] . $matches[2][$i]), $file);
+                $this->get_apib($matches[1][$i] . $matches[2][$i]), $file);
         }
 
         preg_match_all('<!-- schema\(([a-z0-9_.\/\:]*?)\) -->', $file, $matches);
@@ -91,13 +91,20 @@ private function get_apib($filename)
      *
      * @throws ExecutionException when the file could not be found.
      *
-     * @return void
+     * @return string
      */
-    private function file_check($filename)
+    private function file_path($filename)
     {
-        if (!file_exists($filename)) {
+        $path = $this->location . $filename;
+        if (file_exists($path)) {
+            return $path;
+        }
+        $path = stream_resolve_include_path($filename);
+        if ($path === FALSE || !file_exists($path)) {
             throw new ExecutionException("API File not found: $filename", 1);
         }
+
+        return $path;
     }
 
     /**

tests/phpunit.xml

@@ -3,9 +3,7 @@
 <phpunit    bootstrap="test.bootstrap.inc.php"
             backupGlobals="false"
             backupStaticAttributes="false"
-            syntaxCheck="false"
             forceCoversAnnotation="true"
-            mapTestClassNameToCoveredClassName="true"
             colors="true"
             verbose="true">
     <php>
@@ -45,13 +43,13 @@
             <directory>../src/PHPDraft/</directory>
             <exclude>
                 <file>../src/PHPDraft/Out/Minifier.php</file>
-                <directory>../src/PHPDraft/Parse/Tests/</directory>
-                <directory>../src/PHPDraft/Model/Tests/</directory>
-                <directory>../src/PHPDraft/Model/Elements/Tests/</directory>
-                <directory>../src/PHPDraft/Out/Tests/</directory>
-                <directory>../src/PHPDraft/Out/HTML/</directory>
-                <directory>../src/PHPDraft/In/Tests/</directory>
-                <directory>../src/PHPDraft/Core/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/Parse/Tests/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/Model/Tests/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/Model/Elements/Tests/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/Out/Tests/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/Out/HTML/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/In/Tests/</directory>
+                <directory suffix="*Test.php">../src/PHPDraft/Core/</directory>
                 <file>../src/PHPDraft/Parse/ResourceException.php</file>
                 <file>../src/PHPDraft/Model/Comparable.php</file>
                 <file>../src/PHPDraft/Model/Elements/StructureElement.php</file>
@@ -61,16 +59,11 @@
     <logging>
         <log    type="coverage-html"
                 target="../build/coverage"
-                title="PHPDraft"
-                charset="UTF-8"
-                yui="true"
-                highlight="true"
                 lowUpperBound="35"
                 highLowerBound="70"/>
         <log    type="coverage-clover"
                 target="../build/logs/clover.xml"/>
         <log    type="junit"
-                target="../build/logs/junit.xml"
-                logIncompleteSkipped="false"/>
+                target="../build/logs/junit.xml"/>
     </logging>
 </phpunit>