Make autoloader function anonymous.

Author: sebastianbergmann

PHPUnit/Extensions/Story/Autoload.php

@@ -43,43 +43,31 @@
  * @since      File available since Release 1.0.0
  */
 
-function phpunit_story_autoload($class = NULL) {
-    static $classes = NULL;
-    static $path = NULL;
+spl_autoload_register(
+  function ($class) {
+      static $classes = NULL;
+      static $path = NULL;
 
-    if ($classes === NULL) {
-        $classes = array(
-          'phpunit_extensions_story_given' => '/Extensions/Story/Given.php',
-          'phpunit_extensions_story_resultprinter' => '/Extensions/Story/ResultPrinter.php',
-          'phpunit_extensions_story_resultprinter_html' => '/Extensions/Story/ResultPrinter/HTML.php',
-          'phpunit_extensions_story_resultprinter_text' => '/Extensions/Story/ResultPrinter/Text.php',
-          'phpunit_extensions_story_scenario' => '/Extensions/Story/Scenario.php',
-          'phpunit_extensions_story_step' => '/Extensions/Story/Step.php',
-          'phpunit_extensions_story_testcase' => '/Extensions/Story/TestCase.php',
-          'phpunit_extensions_story_then' => '/Extensions/Story/Then.php',
-          'phpunit_extensions_story_when' => '/Extensions/Story/When.php'
-        );
+      if ($classes === NULL) {
+          $classes = array(
+            'phpunit_extensions_story_given' => '/Extensions/Story/Given.php',
+            'phpunit_extensions_story_resultprinter' => '/Extensions/Story/ResultPrinter.php',
+            'phpunit_extensions_story_resultprinter_html' => '/Extensions/Story/ResultPrinter/HTML.php',
+            'phpunit_extensions_story_resultprinter_text' => '/Extensions/Story/ResultPrinter/Text.php',
+            'phpunit_extensions_story_scenario' => '/Extensions/Story/Scenario.php',
+            'phpunit_extensions_story_step' => '/Extensions/Story/Step.php',
+            'phpunit_extensions_story_testcase' => '/Extensions/Story/TestCase.php',
+            'phpunit_extensions_story_then' => '/Extensions/Story/Then.php',
+            'phpunit_extensions_story_when' => '/Extensions/Story/When.php'
+          );
 
-        $path = dirname(dirname(dirname(__FILE__)));
-    }
+          $path = dirname(dirname(dirname(__FILE__)));
+      }
 
-    if ($class === NULL) {
-        $result = array(__FILE__);
+      $cn = strtolower($class);
 
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        $file = $path . $classes[$cn];
-
-        require $file;
-    }
-}
-
-spl_autoload_register('phpunit_story_autoload');
+      if (isset($classes[$cn])) {
+          require $path . $classes[$cn];
+      }
+  }
+);

PHPUnit/Extensions/Story/Autoload.php.in

@@ -43,35 +43,23 @@
  * @since      File available since Release 1.0.0
  */
 
-function phpunit_story_autoload($class = NULL) {
-    static $classes = NULL;
-    static $path = NULL;
+spl_autoload_register(
+  function ($class) {
+      static $classes = NULL;
+      static $path = NULL;
 
-    if ($classes === NULL) {
-        $classes = array(
-          ___CLASSLIST___
-        );
+      if ($classes === NULL) {
+          $classes = array(
+            ___CLASSLIST___
+          );
 
-        $path = dirname(dirname(dirname(__FILE__)));
-    }
+          $path = dirname(dirname(dirname(__FILE__)));
+      }
 
-    if ($class === NULL) {
-        $result = array(__FILE__);
+      $cn = strtolower($class);
 
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        $file = $path . $classes[$cn];
-
-        require $file;
-    }
-}
-
-spl_autoload_register('phpunit_story_autoload');
+      if (isset($classes[$cn])) {
+          require $path . $classes[$cn];
+      }
+  }
+);

build.xml

@@ -1,7 +1,13 @@
 <project name="phpunit-selenium" default="phpab" basedir=".">
  <target name="phpab">
   <exec executable="phpab">
-   <arg line='-o PHPUnit/Extensions/Story/Autoload.php -c -t PHPUnit/Extensions/Story/Autoload.php.in --indent "          " PHPUnit' />
+   <arg value="--output" />
+   <arg path="PHPUnit/Extensions/Story/Autoload.php" />
+   <arg value="--template" />
+   <arg path="PHPUnit/Extensions/Story/Autoload.php.in" />
+   <arg value="--indent" />
+   <arg value="            " />
+   <arg path="PHPUnit" />
   </exec>
  </target>
 </project>