Changed the extension to rely on Behat 2.5 instead of 2.4

Author: stof

README.md

@@ -9,12 +9,12 @@ Provides integration layer for the [Yii framework](http://www.yiiframework.com/)
 * Additional `wunit` session (sets as default) for Mink (if MinkExtension is installed)
   for functional testing without Selenium through [wunit](http://www.yiiframework.com/extension/wunit)
 
-between Behat 2.4+ and Yii.
+between Behat 2.5+ and Yii.
 
 Behat configuration
 -------------------
 
-``` yml
+```yml
 default:
   extensions:
     Behat\MinkExtension\Extension:
@@ -29,19 +29,18 @@ default:
 Installation
 ------------
 
-``` json
+```json
 {
-    "requires": {
-        "behat/mink":           "1.4.*",
-		"behat/mink-extension": "*",
-		"behat/yii-extension":  "*"
+    "require-dev": {
+        "behat/mink":           "~1.5",
+		"behat/mink-extension": "~1.3",
+		"behat/yii-extension":  "~1.0"
     }
 }
 ```
 
-``` bash
-curl http://getcomposer.org/installer | php
-php composer.phar install
+```bash
+$ composer update 'behat/mink' 'behat/mink-extension' 'behat/yii-extension'
 ```
 
 Copyright
@@ -53,4 +52,4 @@ Maintainers
 -----------
 
 * Konstantin Kudryashov [everzet](http://github.com/everzet) [lead developer]
-* Other [awesome developers](https://github.com/Behat/MinkExtension/graphs/contributors)
+* Other [awesome developers](https://github.com/Behat/YiiExtension/graphs/contributors)

composer.json

@@ -3,7 +3,7 @@
     "type": "behat-extension",
     "description": "Yii framework extension for Behat",
     "keywords": ["framework", "web", "bdd"],
-    "homepage": "http://mink.behat.org",
+    "homepage": "http://behat.org",
     "license": "MIT",
     "authors": [
         {
@@ -14,10 +14,20 @@
 
     "require": {
         "php":          ">=5.3.2",
-        "behat/behat":  ">=2.4.1,<2.4.x-dev"
+        "behat/behat":  "~2.5"
+    },
+
+    "suggest": {
+        "behat/mink-wunit-driver": "to register the MinkWUnitDriver with MinkExtension"
     },
 
     "autoload": {
         "psr-0": { "Behat\\YiiExtension": "src/" }
+    },
+
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
     }
 }

src/Behat/YiiExtension/Context/YiiAwareContextInterface.php

@@ -20,7 +20,7 @@ interface YiiAwareContextInterface
     /**
      * Sets Yii web application instance.
      *
-     * @param Yii $mink Yii session manager
+     * @param \CWebApplication $yii Yii application
      */
     function setYiiWebApplication(\CWebApplication $yii);
 }

src/Behat/YiiExtension/Extension.php

@@ -37,10 +37,7 @@ public function load(array $config, ContainerBuilder $container)
         $loader->load('yii.xml');
         $basePath = $container->getParameter('behat.paths.base');
 
-        // starting from Behat 2.4.1, we can check for activated extensions
-        $extensions = $container->hasParameter('behat.extension.classes')
-                    ? $container->getParameter('behat.extension.classes')
-                    : array();
+        $extensions = $container->getParameter('behat.extension.classes');
 
         if (!isset($config['framework_script'])) {
             throw new \InvalidArgumentException(