- Moved the source files into source.

- Supported return instead of assigning the generated map array into a variable.

Author: michaeluno

README.md

@@ -71,6 +71,7 @@ This parameter accepts an array holding options.
  - `output_buffer`		: (boolean)	whether or not output buffer should be printed.     
  - `exclude_classes` 	: (array)   an array holding class names to exclude.
  - `base_dir_var`		: (string)	the variable or constant name that is prefixed before the inclusion path.
+ - `output_var_name`	: (string)  The variable string that the map array is assigned to. Default: `$aClassMap`. If `return` is set, the variable will not be set but the file just returns the generated map array. 
  - `search`				: (array)	the arguments for the directory search options.
     - `allowed_extensions`: (array) allowed file extensions to be listed. 
     - `exclude_dir_paths`: (array) directory paths to exclude from the list. 

composer.json

@@ -3,10 +3,17 @@
   "description": "A PHP class that generates class maps for autoload.",
   "minimum-stability": "stable",
   "license": "MIT",
+  "type": "library",
   "authors": [
     {
       "name": "Michael Uno",
       "email": "michael2@michaeluno.jp"
     }
-  ]
+  ],
+  "require": {
+    "php": ">=5.6.20"
+  },
+  "autoload": {
+    "psr-4": {"PHPClassMapGenerator": "source/"}
+  }
 }

PHPClassMapGenerator.php source/PHPClassMapGenerator.phpPHPClassMapGenerator.php renamed to source/PHPClassMapGenerator.php

@@ -25,13 +25,13 @@ class PHPClassMapGenerator extends PHPClassMapGenerator_Base {
 
     static protected $_aStructure_Options = array(
 
-        'header_class_name'		=>	'',
-        'header_class_path'		=>	'',
-        'output_buffer'			=>	true,
-        'header_type'			=>	'DOCBLOCK',
-        'exclude_classes'		=>	array(),
-        'base_dir_var'			=>	'CLASS_MAP_BASE_DIR_VAR',
-        'output_var_name'		=>	'$aClassMap',
+        'header_class_name'		=> '',
+        'header_class_path'		=> '',
+        'output_buffer'			=> true,
+        'header_type'			=> 'DOCBLOCK',
+        'exclude_classes'		=> array(),
+        'base_dir_var'			=> 'CLASS_MAP_BASE_DIR_VAR',
+        'output_var_name'		=> '$aClassMap',
 
         // Search options
         'search'	=>	array(
@@ -115,7 +115,14 @@ public function __construct( $sBaseDirPath, $asScanDirPaths, $sOutputFilePath, a
         }
 
         // 4. Write to a file
-        $this->___write( $_aFiles, $sBaseDirPath, $sOutputFilePath, $_sHeaderComment, $aOptions[ 'output_var_name' ], $aOptions[ 'base_dir_var' ] );
+        $this->___write(
+            $_aFiles,
+            $sBaseDirPath,
+            $sOutputFilePath,
+            $_sHeaderComment,
+            $aOptions[ 'output_var_name' ],
+            $aOptions[ 'base_dir_var' ]
+        );
 
     }
 
@@ -154,7 +161,9 @@ private function ___write( array $aFiles, $sBaseDirPath, $sOutputFilePath, $sHea
         $_aData[]	 = mb_convert_encoding( '<?php ' . PHP_EOL . $sHeadingComment, 'UTF-8', 'auto' );
 
         // Start array declaration
-        $_aData[]	 = $sOutputArrayVar . ' = array( ' . PHP_EOL;
+        $_aData[]	 = 'return' === $sOutputArrayVar
+            ? 'return array( ' . PHP_EOL
+            : $sOutputArrayVar . ' = array( ' . PHP_EOL;
 
         // Insert the data
         $sBaseDirVar = $sBaseDirVar ? $sBaseDirVar : '""';

PHPClassMapGenerator_Base.php source/PHPClassMapGenerator_Base.phpPHPClassMapGenerator_Base.php renamed to source/PHPClassMapGenerator_Base.php

@@ -1,5 +1,5 @@
 <?php 
-$aClassMap = array( 
+return array( 
     "Foo\FooClass" => CLASS_MAP_BASE_DIR_VAR . "/_scandir/FooClass.php", 
     "Foo\FooClass_Base" => CLASS_MAP_BASE_DIR_VAR . "/_scandir/FooClass_Base.php", 
     "Joe\JoeInterface" => CLASS_MAP_BASE_DIR_VAR . "/_scandir/interfaces/JoeInterface.php", 

class-map.php source/class-map.phpclass-map.php renamed to source/class-map.php

@@ -1,13 +1,13 @@
 <?php
 
-include( dirname( __DIR__ ) . '/PHPClassMapGenerator.php' );
-
-
+include( dirname( __DIR__ ) . '/source/PHPClassMapGenerator.php' );
 
 
 new \PHPClassMapGenerator\PHPClassMapGenerator(
     __DIR__, // base dir
     __DIR__ . '/_scandir', // scan dir name
     __DIR__ . '/class-map.php',
-    []
+    [
+        'output_var_name'		=> 'return',
+    ]
 );

test/class-map.php

@@ -0,0 +1,16 @@
+<?php
+
+include( dirname( __DIR__ ) . '/source/PHPClassMapGenerator.php' );
+
+
+new \PHPClassMapGenerator\PHPClassMapGenerator(
+    dirname( __DIR__ ) . '/source', // base dir
+    dirname( __DIR__ ) . '/source', // scan dir name
+    dirname( __DIR__ ) . '/source/class-map.php',
+    [
+        'base_dir_var' => '__DIR__',
+        'search' => [
+            'exclude_dir_names'		=> [ 'test' ],
+        ]
+    ]
+);

test/generate-map-_scandir.php

@@ -1,10 +1,9 @@
 <?php
 
 define( 'CLASS_MAP_BASE_DIR_VAR', __DIR__ );
-include( __DIR__ . '/class-map.php' );
 
 
-\Autoload::set( $aClassMap );
+\Autoload::set( include( __DIR__ . '/class-map.php' ) );
 
 $_o = new \Foo\FooClass;
 var_dump( get_class( $_o ) );