From 2ebc88634b4627298ed9a7835246a11fda7aee26 Mon Sep 17 00:00:00 2001
From: Klein Florian <florian.klein@free.fr>
Date: Tue, 29 Oct 2013 10:25:15 +0100
Subject: [PATCH] make it compatible with behat v3

---
 behat.yml.dist                                     |  4 ++++
 composer.json                                      |  2 +-
 src/Behat/MinkExtension/Context/MinkContext.php    | 10 +++++-----
 src/Behat/MinkExtension/Context/MinkDictionary.php |  2 +-
 src/Behat/MinkExtension/Context/RawMinkContext.php |  4 ++--
 src/Behat/MinkExtension/Extension.php              |  5 +++++
 src/Behat/MinkExtension/services/core.xml          |  2 +-
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/behat.yml.dist b/behat.yml.dist
index bde123a..0afefc1 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -1,4 +1,8 @@
 default:
+  suites:
+    default:
+      path: %paths.base%/features
+      context: Behat\MinkExtension\Context\MinkContext
   extensions:
     Behat\MinkExtension\Extension:
       base_url: http://en.wikipedia.org/
diff --git a/composer.json b/composer.json
index 9806f22..9516f04 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 
     "require": {
         "php":          ">=5.3.2",
-        "behat/behat":  "~2.5.0",
+        "behat/behat":  "~3@dev",
         "behat/mink":   ">=1.4.3,<1.6-dev",
         "symfony/config": "~2.2"
     },
diff --git a/src/Behat/MinkExtension/Context/MinkContext.php b/src/Behat/MinkExtension/Context/MinkContext.php
index 3c729dd..f8c4435 100644
--- a/src/Behat/MinkExtension/Context/MinkContext.php
+++ b/src/Behat/MinkExtension/Context/MinkContext.php
@@ -4,7 +4,7 @@ namespace Behat\MinkExtension\Context;
 
 use Behat\Gherkin\Node\TableNode;
 
-use Behat\Behat\Context\TranslatedContextInterface,
+use Behat\Behat\Context\TranslatableContextInterface,
     Behat\Behat\Event\ScenarioEvent;
 
 /*
@@ -21,7 +21,7 @@ use Behat\Behat\Context\TranslatedContextInterface,
  *
  * @author Konstantin Kudryashov <ever.zet@gmail.com>
  */
-class MinkContext extends RawMinkContext implements TranslatedContextInterface
+class MinkContext extends RawMinkContext implements TranslatableContextInterface
 {
     /**
      * Opens homepage.
@@ -459,9 +459,9 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
      *
      * @return array
      */
-    public function getTranslationResources()
+    public static function getTranslationResources()
     {
-        return $this->getMinkTranslationResources();
+        return self::getMinkTranslationResources();
     }
 
     /**
@@ -469,7 +469,7 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
      *
      * @return array
      */
-    public function getMinkTranslationResources()
+    public static function getMinkTranslationResources()
     {
         return glob(__DIR__.'/../../../../i18n/*.xliff');
     }
diff --git a/src/Behat/MinkExtension/Context/MinkDictionary.php b/src/Behat/MinkExtension/Context/MinkDictionary.php
index ebde70f..bed0882 100644
--- a/src/Behat/MinkExtension/Context/MinkDictionary.php
+++ b/src/Behat/MinkExtension/Context/MinkDictionary.php
@@ -547,7 +547,7 @@ trait MinkDictionary
      *
      * @return array
      */
-    public function getMinkTranslationResources()
+    public static function getMinkTranslationResources()
     {
         return glob(__DIR__.'/../../../../i18n/*.xliff');
     }
diff --git a/src/Behat/MinkExtension/Context/RawMinkContext.php b/src/Behat/MinkExtension/Context/RawMinkContext.php
index 612e97b..8291d0e 100644
--- a/src/Behat/MinkExtension/Context/RawMinkContext.php
+++ b/src/Behat/MinkExtension/Context/RawMinkContext.php
@@ -2,7 +2,7 @@
 
 namespace Behat\MinkExtension\Context;
 
-use Behat\Behat\Context\BehatContext;
+use Behat\Behat\Context\ContextInterface;
 
 use Behat\Mink\Mink,
     Behat\Mink\WebAssert,
@@ -22,7 +22,7 @@ use Behat\Mink\Mink,
  *
  * @author Konstantin Kudryashov <ever.zet@gmail.com>
  */
-class RawMinkContext extends BehatContext implements MinkAwareInterface
+class RawMinkContext implements MinkAwareInterface, ContextInterface
 {
     private $mink;
     private $minkParameters;
diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php
index 8e8c3a5..a8e209a 100644
--- a/src/Behat/MinkExtension/Extension.php
+++ b/src/Behat/MinkExtension/Extension.php
@@ -427,4 +427,9 @@ class Extension implements ExtensionInterface
 
         return $config;
     }
+
+    public function getName()
+    {
+        return 'mink';
+    }
 }
diff --git a/src/Behat/MinkExtension/services/core.xml b/src/Behat/MinkExtension/services/core.xml
index 3849395..7ed4a3d 100644
--- a/src/Behat/MinkExtension/services/core.xml
+++ b/src/Behat/MinkExtension/services/core.xml
@@ -43,7 +43,7 @@
         <service id="behat.mink.context.initializer" class="%behat.mink.context.initializer.class%">
             <argument type="service" id="behat.mink" />
             <argument>%behat.mink.parameters%</argument>
-            <tag name="behat.context.initializer" />
+            <tag name="context.initializer" />
         </service>
 
         <service id="behat.mink.listener.sessions_listener" class="%behat.mink.listener.sessions_listener.class%">