Change class alias prefix to behatch:context

Behatch · Nov 23, 2017 · 83b6d37 · 83b6d37
1 parent 700869a
commit 83b6d37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -4,17 +4,17 @@ default:
             paths: [ '%paths.base%/tests/features' ]
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - behatch:browser:
+                - behatch:context:browser:
                     timeout: 1
-                - behatch:debug:
+                - behatch:context:debug:
                     screenshotDir: "."
-                - behatch:json:
+                - behatch:context:json:
                     evaluationMode: javascript
-                - behatch:rest
-                - behatch:system:
+                - behatch:context:rest
+                - behatch:context:system:
                     root: "."
-                - behatch:table
-                - behatch:xml
+                - behatch:context:table
+                - behatch:context:xml
     extensions:
         Behat\MinkExtension\ServiceContainer\MinkExtension:
             base_url: 'http://localhost:8080'

diff --git a/src/Context/ContextClass/ClassResolver.php b/src/Context/ContextClass/ClassResolver.php
@@ -8,31 +8,15 @@ class ClassResolver implements BaseClassResolver
 {
     public function supportsClass($contextClass)
     {
-        return (strpos($contextClass, 'behatch:') === 0);
+        return (strpos($contextClass, 'behatch:context:') === 0);
     }
 
     public function resolveClass($contextClass)
     {
-        if (strpos($contextClass, 'behatch:context:') === false) {
-            list(, $className) = explode(':', $contextClass);
+        $className = preg_replace_callback('/(^\w|:\w)/', function ($matches) {
+            return str_replace(':', '\\', strtoupper($matches[0]));
+        }, $contextClass);
 
-            $className = ucfirst($className);
-
-            @trigger_error(
-                sprintf(
-                    'Deprecated context alias use behatch:context:%s instead',
-                    strtolower($className)
-                ),
-                E_USER_DEPRECATED
-            );
-
-            return "\\Behatch\\Context\\{$className}Context";
-        } else {
-            $className = preg_replace_callback('/(^\w|:\w)/', function ($matches) {
-                return str_replace(':', '\\', strtoupper($matches[0]));
-            }, $contextClass);
-
-            return $className . 'Context';
-        }
+        return $className . 'Context';
     }
 }