Renamed the extension class to benefit from the behat shortcuts

doc/index.rst

@@ -19,25 +19,6 @@ This extension requires:
 
 * Behat 3.0+
 
-Through PHAR
-~~~~~~~~~~~~
-
-First, download phar archives:
-
-* `behat.phar <http://behat.org/downloads/behat.phar>`_ - Behat itself
-* `symfony2_extension.phar <http://behat.org/downloads/symfony2_extension.phar>`_
-  - integration extension
-
-After downloading and placing ``*.phar`` into project directory, you need to
-activate ``Symfony2Extension`` in your ``behat.yml``:
-
-  .. code-block:: yaml
-
-      default:
-        # ...
-        extensions:
-          symfony2_extension.phar: ~
-
 
 Through Composer
 ~~~~~~~~~~~~~~~~
@@ -51,7 +32,7 @@ The easiest way to keep your suite updated is to use `Composer <http://getcompos
        {
            "require": {
                ...
-               
+
                "behat/symfony2-extension": "~2.0@dev"
            }
        }
@@ -69,7 +50,7 @@ The easiest way to keep your suite updated is to use `Composer <http://getcompos
        default:
            # ...
            extensions:
-               Behat\Symfony2Extension\Extension: ~
+               Behat\Symfony2Extension: ~
 
 4. Register a suite for your bundle:
 
@@ -81,37 +62,24 @@ The easiest way to keep your suite updated is to use `Composer <http://getcompos
                    type: symfony_bundle
                    bundle: AcmeDemoBundle
 
-.. note::
-
-    If you're using Symfony2.1 with Composer, there could be a conflict of
-    Symfony2 with Behat, that will prevent Symfony2 from loading Doctrine
-    or Validation annotations. This is not a problem with the latest version
-    of Composer, but if you are running an older version and see errors,
-    just update your ``app/autoload.php``:
-
-    .. code-block:: php
-
-        <?php
-
-        use Doctrine\Common\Annotations\AnnotationRegistry;
+Through PHAR
+~~~~~~~~~~~~
 
-        if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
-            $loader = require __DIR__.'/../vendor/autoload.php';
-        } else {
-            $loader = new Composer\Autoload\ClassLoader();
-            $loader->register();
-        }
+First, download phar archives:
 
-        // intl
-        if (!function_exists('intl_get_error_code')) {
-            require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php';
+* `behat.phar <http://behat.org/downloads/behat.phar>`_ - Behat itself
+* `symfony2_extension.phar <http://behat.org/downloads/symfony2_extension.phar>`_
+  - integration extension
 
-            $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs');
-        }
+After downloading and placing ``*.phar`` into project directory, you need to
+activate ``Symfony2Extension`` in your ``behat.yml``:
 
-        AnnotationRegistry::registerLoader('class_exists');
+  .. code-block:: yaml
 
-        return $loader;
+      default:
+        # ...
+        extensions:
+          symfony2_extension.phar: ~
 
 .. note::
 
@@ -127,7 +95,7 @@ The easiest way to keep your suite updated is to use `Composer <http://getcompos
         },
 
     This will make the ``behat`` command available from the ``bin`` directory.  If you run
-    behat this way, you do not need to download ``behat.phar``.
+    behat this way, you do not need to download ``behat.phar``
 
 Usage
 -----
@@ -206,47 +174,24 @@ BrowserKit driver for Mink:
         }
     }
 
-The new Mink driver will be enabled automatically.
+The new Mink driver will be available for usage:
 
 .. code-block:: yaml
 
     default:
         # ...
         extensions:
-            Behat\Symfony2Extension\Extension: ~
-            Behat\MinkExtension\Extension: ~
-
-Also, you can make the ``symfony2`` session the default one by setting ``default_session``
-option in MinkExtension:
-
-.. code-block:: yaml
-
-    default:
-        # ...
-        extensions:
-            Behat\Symfony2Extension\Extension: ~
-            Behat\MinkExtension\Extension:
-                default_session: 'symfony2'
+            Behat\Symfony2Extension: ~
+            Behat\MinkExtension:
+                sessions:
+                    my_session:
+                        symfony2: ~
 
 .. caution::
 
-    The KernelDriver of the symfony2 session requires using a Symfony environment where
-    the test mode of the FrameworkBundle is enabled. It uses the ``test`` environment by
-    default, for which it is the case in the Symfony2 Standard Edition.
-
-.. note::
-
-    If you use the MinkExtension but don't want to enable the symfony2 session,
-    you can disable it explicitly:
-
-    .. code-block:: yaml
-
-        default:
-            # ...
-            extensions:
-                Behat\Symfony2Extension\Extension:
-                    mink_driver: false
-                Behat\MinkExtension\Extension: ~
+    The KernelDriver requires using a Symfony environment where the test mode of the
+    FrameworkBundle is enabled. It uses the ``test`` environment by default, for which it
+    is the case in the Symfony2 Standard Edition.
 
 Configuration
 -------------
@@ -274,6 +219,3 @@ configure Symfony2 kernel inside Behat to fulfil all your needs.
     ``Features\Context\FeatureContext``.
   - ``class_suffix`` - suffix from bundle classname for context class. Defaults to
     ``Features``.
-
-* ``mink_driver`` - if set to true - extension will load the ``symfony2`` session
-  for Mink.

init.php

@@ -16,4 +16,4 @@
     }
 }, true, false);
 
-return new Behat\Symfony2Extension\Extension;
+return new Behat\Symfony2Extension\ServiceContainer\Symfony2Extension;

spec/Behat/Symfony2Extension/ServiceContainer/Driver/SymfonyFactorySpec.php

@@ -2,7 +2,7 @@
 
 namespace spec\Behat\Symfony2Extension\ServiceContainer\Driver;
 
-use Behat\Symfony2Extension\Extension;
+use Behat\Symfony2Extension\ServiceContainer\Symfony2Extension;
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
@@ -36,6 +36,6 @@ function it_creates_a_kernel_driver_definition()
         $definition->getClass()->shouldBe('Behat\Symfony2Extension\Driver\KernelDriver');
         $args = $definition->getArguments();
         $args[0]->shouldBeAnInstanceOf('Symfony\Component\DependencyInjection\Reference');
-        $args[0]->__toString()->shouldBe(Extension::KERNEL_ID);
+        $args[0]->__toString()->shouldBe(Symfony2Extension::KERNEL_ID);
     }
 }

src/Behat/Symfony2Extension/ServiceContainer/Driver/SymfonyFactory.php

@@ -12,7 +12,7 @@
 namespace Behat\Symfony2Extension\ServiceContainer\Driver;
 
 use Behat\MinkExtension\ServiceContainer\Driver\DriverFactory;
-use Behat\Symfony2Extension\Extension;
+use Behat\Symfony2Extension\ServiceContainer\Symfony2Extension;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -57,7 +57,7 @@ public function buildDriver(array $config)
         }
 
         return new Definition('Behat\Symfony2Extension\Driver\KernelDriver', array(
-            new Reference(Extension::KERNEL_ID),
+            new Reference(Symfony2Extension::KERNEL_ID),
             '%mink.base_url%',
         ));
     }

src/Behat/Symfony2Extension/Extension.php → src/Behat/Symfony2Extension/ServiceContainer/Symfony2Extension.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Behat\Symfony2Extension;
+namespace Behat\Symfony2Extension\ServiceContainer;
 
 use Behat\Behat\Context\ServiceContainer\ContextExtension;
 use Behat\Behat\Gherkin\ServiceContainer\GherkinExtension;
@@ -28,8 +28,9 @@
  * Symfony2 extension for Behat class.
  *
  * @author Konstantin Kudryashov <[email protected]>
+ * @author Christophe Coevoet <[email protected]>
  */
-class Extension implements ExtensionInterface
+class Symfony2Extension implements ExtensionInterface
 {
     const KERNEL_ID = 'symfony2_extension.kernel';
 

testapp/behat.yml

@@ -3,8 +3,8 @@ default:
         progress:
             paths: false
     extensions:
-        Behat\Symfony2Extension\Extension: ~
-        Behat\MinkExtension\Extension:
+        Behat\Symfony2Extension: ~
+        Behat\MinkExtension:
             default_session: 'symfony2'
             sessions:
                 symfony2: