fixed typos and autoloader

Behat · May 18, 2012 · 09b6cc1 · 09b6cc1
1 parent 8a074e8
commit 09b6cc1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/build.php b/build.php
@@ -9,6 +9,8 @@
  * with this source code in the file LICENSE.
  */
 
+chdir(__DIR__);
+
 $filename = 'symfony2_extension.phar';
 
 if (file_exists($filename)) {

diff --git a/init.php b/init.php
@@ -9,14 +9,11 @@
  * with this source code in the file LICENSE.
  */
 
-require __DIR__.'/src/Behat/Symfony2Extension/Compiler/KernelInitializationPass.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Console/Processor/InitProcessor.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Console/Processor/LocatorProcessor.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Context/ClassGuesser/BundleContextClassGuesser.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Context/Initializer/KernelAwareInitializer.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Context/KernelAwareInterface.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Context/KernelDictionary.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Driver/KernelDriver.php';
-require __DIR__.'/src/Behat/Symfony2Extension/Driver/Extension.php';
+spl_autoload_register(function($class) {
+    if (false !== strpos($class, 'Behat\\Symfony2Extension')) {
+        require_once(__DIR__.'/src/'.str_replace('\\', '/', $class).'.php');
+        return true;
+    }
+}, true, false);
 
 return new Behat\Symfony2Extension\Extension;
diff --git a/src/Behat/Symfony2Extension/Compiler/KernelInitializationPass.php b/src/Behat/Symfony2Extension/Compiler/KernelInitializationPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Behat\MinkExtension\Compiler;
+namespace Behat\Symfony2Extension\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder,
     Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -52,7 +52,7 @@ public function process(ContainerBuilder $container)
             $container->setParameter(
                 'behat.paths.features',
                 $bundle->getPath().DIRECTORY_SEPARATOR.
-                    $this->container->getParameter('behat.symfony2_extension.context.path_suffix');
+                    $this->container->getParameter('behat.symfony2_extension.context.path_suffix')
             );
         }
     }

diff --git a/src/Behat/Symfony2Extension/Context/KernelDictionary.php b/src/Behat/Symfony2Extension/Context/KernelDictionary.php
@@ -26,7 +26,7 @@ trait KernelDictionary
      *
      * @param KernelInterface $kernel HttpKernel instance
      */
-    public function setKernel(KernelInterface $kernel);
+    public function setKernel(KernelInterface $kernel)
     {
         $this->kernel = $kernel;
     }