1.19

jorgecc · jorgecc · commit 581f96aeb16c · 2020-06-05T10:09:57.000-04:00
diff --git a/AutoLoadOne.php b/AutoLoadOne.php
@@ -41,12 +41,12 @@
  *
  * @copyright Jorge Castro C. MIT License https://github.com/EFTEC/AutoLoadOne
  *
- * @version   1.18 2020-04-23
+ * @version   1.19 2020-05-26
  * @noautoload
  */
 class AutoLoadOne
 {
-    const VERSION = '1.18';
+    const VERSION = '1.19';
     const JSON_UNESCAPED_SLASHES = 64;
     const JSON_PRETTY_PRINT = 128;
     const JSON_UNESCAPED_UNICODE = 256;
@@ -712,9 +712,9 @@ private function createArrayPHP($array) {
 
     public function listFolderFiles($dir) {
         $arr = [];
-        $this->listFolderFilesAlt($dir, $arr);
-
-        return $arr;
+        $json=[];
+        $this->listFolderFilesAlt($dir, $arr,$json);
+        return [$arr,$json];
     }
 
     private function fixRelative($path) {
@@ -725,7 +725,7 @@ private function fixRelative($path) {
         return $path;
     }
 
-    public function listFolderFilesAlt($dir, &$list) {
+    public function listFolderFilesAlt($dir, &$list,&$json) {
         if ($dir === '') {
             return [];
         }
@@ -739,18 +739,43 @@ public function listFolderFilesAlt($dir, &$list) {
         }
         foreach ($ffs as $ff) {
             if ($ff !== '.' && $ff !== '..') {
+                if($ff==='composer.json') {
+                    $json[] = $list[] = $dir . '/' . $ff;
+                }
                 if ((strlen($ff) >= 5) && substr($ff, -4) == $this->extension) {
                     // PHP_OS_FAMILY=='Windows'
                     $list[] = $dir . '/' . $ff;
                 }
                 if (is_dir($dir . '/' . $ff)) {
-                    $this->listFolderFilesAlt($dir . '/' . $ff, $list);
+                    $this->listFolderFilesAlt($dir . '/' . $ff, $list,$json);
                 }
             }
         }
 
         return $list;
     }
+    public function parseJSONFile($filename) {
+        try {
+            $filenameFixed=$this->fixRelative($filename).'/composer.json';
+            if (is_file($filenameFixed)) {
+                
+                $content = file_get_contents($filenameFixed);
+            } else {
+                return [];
+            }
+            if ($this->debugMode) {
+                echo $filename . ' trying token...<br>';
+            }
+            $tokens = json_decode($content,true);
+        } catch (Exception $ex) {
+            echo "Error in $filename\n";
+            die(1);
+        }
+        if(isset($tokens['autoload']['files'])) {
+            return $tokens['autoload']['files'];
+        }
+        return [];
+    }
 
     /**
      * @param        $filename
@@ -861,11 +886,6 @@ public function genPath($path) {
                     break;
                 }
             }
-            /*if (substr($path,1,2)==':/') {
-                // windows style c:/somefolder
-                $baseCommon=0;
-            }
-            */
             // moving down the relative path (/../../)
             $c = substr_count(substr($this->baseGen, $baseCommon), '/');
             $r = str_repeat('/..', $c);
@@ -952,22 +972,34 @@ public function process() {
         $this->fileGen = $this->fixSeparator($this->fileGen);
         if ($this->rooturl) {
             $this->baseGen = $this->dirNameLinux($this->fileGen . '/' . $this->getFileName());
-            $files = $this->listFolderFiles($this->rooturl);
+            $filesjson = $this->listFolderFiles($this->rooturl);
+            $files=$filesjson[0];
+            /** @var array $json Example['dir/composer.json','folder/composer.json'] */
+            $json=$filesjson[1]; 
             $filesAbsolute = array_fill(0, count($files), false);
+            $jsonAbsolute = array_fill(0, count($json), false);
 
             $extPathArr = explode(',', $this->externalPath);
             foreach ($extPathArr as $ep) {
                 $ep = $this->dirNameLinux($ep, false);
-                $files2 = $this->listFolderFiles($ep);
+                $filesjson2 = $this->listFolderFiles($ep);
+                $files2=$filesjson2[0];
+                $json2=$filesjson2[1]; 
+                foreach ($json2 as $newJson) {
+                    $json[]=$newJson;
+                    $jsonAbsolute[]=true;
+                }
                 foreach ($files2 as $newFile) {
                     $files[] = $newFile;
                     $filesAbsolute[] = true;
                 }
             }
+
             $ns = [];
             $nsAlt = [];
             $pathAbsolute = [];
             $autoruns = [];
+            $autorunsFromJson=[];
             $autorunsFirst = [];
             $excludeNSArr = str_replace(["\n", "\r", ' '], '', $this->excludeNS);
             $excludeNSArr = explode(',', $excludeNSArr);
@@ -980,6 +1012,27 @@ public function process() {
 
             $this->result = '';
             if ($this->button) {
+                foreach($json as $key=>$f) {
+                    //echo "running $f<br>";
+                    $f = $this->fixSeparator($f);
+                    $dirOriginal = $this->dirNameLinux($f);
+                    
+                    $jsonE=$this->parseJSONFile($dirOriginal);
+                    //var_dump($jsonE);
+                    foreach($jsonE as $item) {
+                        if (!$jsonAbsolute[$key]) {
+                            $dir = $this->genPath($dirOriginal); //folder/subfolder/f1
+                            $full = $dir.'/'.$item; ///folder/subfolder/f1/F1.php
+                        } else {
+                            $dir = $dirOriginal; //D:/Dropbox/www/currentproject/AutoLoadOne/examples/folder
+                            $full = $dirOriginal.'/'.$item; //D:/Dropbox/www/currentproject/AutoLoadOne/examples/folder/NaturalClass.php
+                        }
+                        $autoruns[] = $full;
+                        $autorunsFromJson[]=$full;
+                        //var_dump($this->baseGen);
+                        //echo "<br>adding autorun $item , $dirOriginal , $dir , $full<br>";
+                    }
+                }
                 foreach ($files as $key => $f) {
                     $f = $this->fixSeparator($f);
                     $runMe = '';
@@ -1089,7 +1142,12 @@ public function process() {
                     $this->addLog("Adding file <b>$auto</b> Reason: <b>@autoload first</b> found");
                 }
                 foreach ($autoruns as $auto) {
-                    $this->addLog("Adding file <b>$auto</b> Reason: <b>@autoload</b> found");
+                    if(in_array($auto,$autorunsFromJson)) {
+                        $this->addLog("Adding file <b>$auto</b> Reason: <b>composer.json</b> found");
+                    } else {
+                        $this->addLog("Adding file <b>$auto</b> Reason: <b>@autoload</b> found");    
+                    }
+                    
                 }
                 $autoruns = array_merge($autorunsFirst, $autoruns);
                 $this->result =
diff --git a/README.md b/README.md
@@ -509,10 +509,46 @@ Deny from all
 </Files>
 ```
 
-* Or you could restrict the access to PHP and it's the behaviour by default on Linux (it runs under Apache's account, most of the time as user NOBODY)
+* Or you could restrict the access to PHP and it's the behaviour by default on Linux (it runs under Apache's account
+, most of the time as user NOBODY)
+
+
+## Composer.json
+
+Commonly, this library does not need **composer.json**, and it actively ignores its configuration (because it reads the PHP
+ source code directly). However, since 1.19 it reads part of the information of composer.json (for compatibility 
+purpose).  For example, the library **guzzlehttp** uses this feature.   
+  
+Let's say the next file:  
+
+composer.json  
+  
+```json  
+{
+  "autoload": {
+    "psr-4": {
+      "blahblahblah": "some folder blahblahblah/"
+    },
+    "files": ["src/functions_include.php"]
+  }
+}
+```
+
+AutoLoadOne includes the file (or files) declared in composer.json and declared in 'files'.  This file or files is 
+ added to our autoload.php as follows:
+ 
+```php   
+@include __DIR__.'/folder/jsontest/src/functions_include.php'; 
+```
+Since it is done once (when autoload.php is generated), then it does not affect the performance.  
+  
+
+
 
 ## Version
 
+* 1.19 2020-06-05  
+    * Added composer.json 'autoload'/'files'   
 * 1.18 2020-04-23 
     * Some cleaning.
     * The generated file is alsoc cleaned and optimized.   
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "eftec/autoloadone",
   "description": "AutoloadOne is a program that generates an autoload class for PHP.",
   "type": "software",
-  "version": "1.18",
+  "version": "1.19",
   "keywords": ["php","autoload"],
   "homepage": "https://github.com/EFTEC/AutoLoadOne",
   "minimum-stability": "beta",
diff --git a/examples/autoload.php b/examples/autoload.php
@@ -3,13 +3,13 @@
  * This class is used for autocomplete.
  * Class _AUTOLOAD_
  * @noautoload it avoids to index this class
- * @generated by AutoLoadOne 1.17 generated 2020/04/23 05:26:20
+ * @generated by AutoLoadOne 1.18 generated 2020/06/05 09:59:32
  * @copyright Copyright Jorge Castro C - MIT License. https://github.com/EFTEC/AutoLoadOne
  */
-$s5ea207fc4c063__debug = true;
+$s5eda4fc45cee8__debug = true;
 
 /* @var string[] Where $_arrautoloadCustom['namespace\Class']='folder\file.php' */
-$s5ea207fc4c063__arrautoloadCustom = [
+$s5eda4fc45cee8__arrautoloadCustom = [
 	'ClassFolder1' => '|1|1.php',
 	'ClassFolder2' => '|1|2.php',
 	'ClassFolder3' => '|1|3.php',
@@ -21,15 +21,15 @@
 	'ClassWithoutNameSpace' => '|4|alt/ClassWithoutNameSpace.php',
 	'nsfolder\subnamespace\CustomClass' => '|4|alt/CustomClass.php'
 ];
-$s5ea207fc4c063__arrautoloadCustomCommon = [
+$s5eda4fc45cee8__arrautoloadCustomCommon = [
 	1 => '/folder/folder1234567890123456789/ClassFolder',
 	2 => '/folder/multiplenamespace.php',
 	3 => '/folder/multiplenamespace',
 	4 => '/folder/subfolder'
 ];
 
 /* @var string[] Where $_arrautoload['namespace']='folder' */
-$s5ea207fc4c063__arrautoload = [
+$s5eda4fc45cee8__arrautoload = [
 	'nsfolder' => '/folder',
 	'specialnamespace' => '/folder',
 	'folder_ns\subnamespace\ClassFolder1' => '|1|',
@@ -43,36 +43,36 @@
 	'nsfolder\subnamespace\f5' => '|2|/f5',
 	'sub\sub\sub' => '|2|/subsubfolder'
 ];
-$s5ea207fc4c063__arrautoloadCommon = [
+$s5eda4fc45cee8__arrautoloadCommon = [
 	1 => '/folder/folder_ns_1234567890123456789',
 	2 => '/folder/subfolder'
 ];
 
 /* @var boolean[] Where $_arrautoload['namespace' or 'namespace\Class']=true if it's absolute (it uses the full path) */
-$s5ea207fc4c063__arrautoloadAbsolute = [
+$s5eda4fc45cee8__arrautoloadAbsolute = [
  
 ];
 
 /**
  * @param $class_name
  * @throws Exception
  */
-function s5ea207fc4c063__auto($class_name)
+function s5eda4fc45cee8__auto($class_name)
 {
     // its called only if the class is not loaded.
     $ns = dirname($class_name); // without trailing
     $ns = ($ns === '.') ? '' : $ns;
     $cls = basename($class_name);
     // special cases
-    if (isset($GLOBALS['s5ea207fc4c063__arrautoloadCustom'][$class_name])) {
-        s5ea207fc4c063__loadIfExists($GLOBALS['s5ea207fc4c063__arrautoloadCustom'][$class_name]
-            , $class_name,'s5ea207fc4c063__arrautoloadCustomCommon');
+    if (isset($GLOBALS['s5eda4fc45cee8__arrautoloadCustom'][$class_name])) {
+        s5eda4fc45cee8__loadIfExists($GLOBALS['s5eda4fc45cee8__arrautoloadCustom'][$class_name]
+            , $class_name,'s5eda4fc45cee8__arrautoloadCustomCommon');
         return;
     }
     // normal (folder) cases
-    if (isset($GLOBALS['s5ea207fc4c063__arrautoload'][$ns])) {
-        s5ea207fc4c063__loadIfExists($GLOBALS['s5ea207fc4c063__arrautoload'][$ns] . '/' . $cls . '.php'
-            , $ns,'s5ea207fc4c063__arrautoloadCommon');
+    if (isset($GLOBALS['s5eda4fc45cee8__arrautoload'][$ns])) {
+        s5eda4fc45cee8__loadIfExists($GLOBALS['s5eda4fc45cee8__arrautoload'][$ns] . '/' . $cls . '.php'
+            , $ns,'s5eda4fc45cee8__arrautoloadCommon');
         return;
     }
 }
@@ -84,20 +84,20 @@ function s5ea207fc4c063__auto($class_name)
  * @param string $arrayName [optional] it's the name of the arrayname used to replaced |n| values. 
  * @throws Exception
  */
-function s5ea207fc4c063__loadIfExists($filename, $key,$arrayName='')
+function s5eda4fc45cee8__loadIfExists($filename, $key,$arrayName='')
 {
-    if (isset($GLOBALS['s5ea207fc4c063__arrautoloadAbsolute'][$key])) {
+    if (isset($GLOBALS['s5eda4fc45cee8__arrautoloadAbsolute'][$key])) {
         $fullFile = $filename; // its an absolute path
         if (strpos($fullFile, '../') === 0) { // Or maybe, not, it's a remote-relative path.
             $oldDir = getcwd();  // we copy the current url
             chdir(__DIR__);
         }
     } else {
-        $fullFile = __DIR__ . '/' . s5ea207fc4c063__replaceCurlyVariable($filename, $arrayName); // its relative to this path
+        $fullFile = __DIR__ . '/' . s5eda4fc45cee8__replaceCurlyVariable($filename, $arrayName); // its relative to this path
     }
     /** @noinspection PhpIncludeInspection */
     if ((@include $fullFile) === false) {
-        if ($GLOBALS['s5ea207fc4c063__debug']) {
+        if ($GLOBALS['s5eda4fc45cee8__debug']) {
             throw new RuntimeException('AutoLoadOne Error: Loading file [' . __DIR__ . '/' . $filename . '] for class [' . basename($filename) .
                                  ']');
         }
@@ -107,7 +107,7 @@ function s5ea207fc4c063__loadIfExists($filename, $key,$arrayName='')
         chdir($oldDir);
     }
 } 
-function s5ea207fc4c063__replaceCurlyVariable($string,$arrayName) {
+function s5eda4fc45cee8__replaceCurlyVariable($string,$arrayName) {
     if(strpos($string,'|')===false) {
         return $string;
     } // nothing to replace.
@@ -119,10 +119,11 @@ function s5ea207fc4c063__replaceCurlyVariable($string,$arrayName) {
 }
 
 spl_autoload_register(static function ($class_name) {
-    s5ea207fc4c063__auto($class_name);
+    s5eda4fc45cee8__auto($class_name);
 });
 // autorun
 @include __DIR__.'/folder/runme.php';
+@include __DIR__.'/folder/jsontest/src/functions_include.php';
 @include __DIR__.'/folder/RunMeClass.php';
 @include __DIR__.'/folder/runmelast.php';
 
diff --git a/examples/folder/jsontest/composer.json b/examples/folder/jsontest/composer.json
@@ -0,0 +1,8 @@
+{
+  "autoload": {
+    "psr-4": {
+      "blahblahblah": "some folder blahblahblah/"
+    },
+    "files": ["src/functions_include.php"]
+  }
+}
diff --git a/examples/folder/jsontest/src/functions_include.php b/examples/folder/jsontest/src/functions_include.php
@@ -0,0 +1,3 @@
+<?php
+
+echo "include me!<br>";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+echo "include me!<br>";`