Merge pull request #135 from Behat/throw-an-exception-only-if-bootstrap-is-not-the-default-one

Throw an exception only if the bootstrap file is not the default one

Author: sroze

src/Behat/Symfony2Extension/ServiceContainer/Symfony2Extension.php

@@ -34,6 +34,7 @@
 class Symfony2Extension implements ExtensionInterface
 {
     const KERNEL_ID = 'symfony2_extension.kernel';
+    const DEFAULT_KERNEL_BOOTSTRAP = 'app/autoload.php';
 
     /**
      * {@inheritdoc}
@@ -70,7 +71,7 @@ public function configure(ArrayNodeDefinition $builder)
                 ->arrayNode('kernel')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->scalarNode('bootstrap')->defaultValue('app/autoload.php')->end()
+                        ->scalarNode('bootstrap')->defaultValue(self::DEFAULT_KERNEL_BOOTSTRAP)->end()
                         ->scalarNode('path')->defaultValue('app/AppKernel.php')->end()
                         ->scalarNode('class')->defaultValue('AppKernel')->end()
                         ->scalarNode('env')->defaultValue('test')->end()
@@ -125,7 +126,7 @@ public function process(ContainerBuilder $container)
                 require_once($bootstrap);
             } elseif (file_exists($bootstrapPath)) {
                 require_once($bootstrapPath);
-            } else {
+            } elseif ($bootstrapPath !== self::DEFAULT_KERNEL_BOOTSTRAP) {
                 throw new ProcessingException(
                     'Could not load bootstrap file. Please check your configuration at "kernel.bootstrap"'
                 );