From 430db652a2e713ca17456413570f2e17e7a908f9 Mon Sep 17 00:00:00 2001
From: Tibor Kotosz <tkotosz@inviqa.com>
Date: Sun, 8 Nov 2015 14:02:10 +0100
Subject: [PATCH] Fix class names

---
 .../DriverClassNameResolver.php                    | 10 +++++-----
 .../Behat/ExtensionDriverLocator/DriverLocator.php | 14 +++++++-------
 .../ExtensionDriverLocator/DriverNodeBuilder.php   | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Bex/Behat/ExtensionDriverLocator/DriverClassNameResolver.php b/src/Bex/Behat/ExtensionDriverLocator/DriverClassNameResolver.php
index 1562eac..16341ec 100644
--- a/src/Bex/Behat/ExtensionDriverLocator/DriverClassNameResolver.php
+++ b/src/Bex/Behat/ExtensionDriverLocator/DriverClassNameResolver.php
@@ -2,7 +2,7 @@
 
 namespace Bex\Behat\ExtensionDriverLocator;
 
-use Bex\Behat\ExtensionDriverLocator\ClassValidator;
+use Bex\Behat\ExtensionDriverLocator\DriverClassValidator;
 use Symfony\Component\DependencyInjection\Container as DIContainer;
 
 class DriverClassNameResolver
@@ -13,15 +13,15 @@ class DriverClassNameResolver
     private $namespace;
 
     /**
-     * @var ClassValidator
+     * @var DriverClassValidator
      */
     private $classValidator;
 
     /**
-     * @param string         $namespace
-     * @param ClassValidator $classValidator
+     * @param string               $namespace
+     * @param DriverClassValidator $classValidator
      */
-    public function __construct($namespace, ClassValidator $classValidator)
+    public function __construct($namespace, DriverClassValidator $classValidator)
     {
         $this->namespace = $namespace;
         $this->classValidator = $classValidator;
diff --git a/src/Bex/Behat/ExtensionDriverLocator/DriverLocator.php b/src/Bex/Behat/ExtensionDriverLocator/DriverLocator.php
index 6ea1f32..07ec832 100644
--- a/src/Bex/Behat/ExtensionDriverLocator/DriverLocator.php
+++ b/src/Bex/Behat/ExtensionDriverLocator/DriverLocator.php
@@ -2,9 +2,9 @@
 
 namespace Bex\Behat\ExtensionDriverLocator;
 
+use Bex\Behat\ExtensionDriverLocator\DriverClassNameResolver;
+use Bex\Behat\ExtensionDriverLocator\DriverClassValidator;
 use Bex\Behat\ExtensionDriverLocator\DriverInterface;
-use Bex\Behat\ExtensionDriverLocator\ClassNameResolver;
-use Bex\Behat\ExtensionDriverLocator\ClassValidator;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\NodeInterface;
 use Symfony\Component\Config\Definition\Processor;
@@ -13,7 +13,7 @@
 class DriverLocator
 {
     /**
-     * @var ClassNameResolver
+     * @var DriverClassNameResolver
      */
     private $classNameResolver;
 
@@ -23,9 +23,9 @@ class DriverLocator
     private $drivers = [];
 
     /**
-     * @param ClassNameResolver $classNameResolver
+     * @param DriverClassNameResolver $classNameResolver
      */
-    public function __construct(ClassNameResolver $classNameResolver)
+    public function __construct(DriverClassNameResolver $classNameResolver)
     {
         $this->classNameResolver = $classNameResolver;
     }
@@ -38,7 +38,7 @@ public function __construct(ClassNameResolver $classNameResolver)
      */
     public static function getInstance($namespace, $parent = '')
     {
-        return new self(new ClassNameResolver($namespace, new ClassValidator($parent)));
+        return new self(new DriverClassNameResolver($namespace, new DriverClassValidator($parent)));
     }
 
     /**
@@ -66,7 +66,7 @@ public function getDrivers()
     }
 
     /**
-     * @param array            $driverKeys 
+     * @param array $driverKeys 
      *
      * @return DriverInterface[]
      */
diff --git a/src/Bex/Behat/ExtensionDriverLocator/DriverNodeBuilder.php b/src/Bex/Behat/ExtensionDriverLocator/DriverNodeBuilder.php
index f72bf41..9dddaf0 100644
--- a/src/Bex/Behat/ExtensionDriverLocator/DriverNodeBuilder.php
+++ b/src/Bex/Behat/ExtensionDriverLocator/DriverNodeBuilder.php
@@ -2,21 +2,21 @@
 
 namespace Bex\Behat\ExtensionDriverLocator;
 
-use Bex\Behat\ExtensionDriverLocator\ClassNameResolver;
-use Bex\Behat\ExtensionDriverLocator\ClassValidator;
+use Bex\Behat\ExtensionDriverLocator\DriverClassNameResolver;
+use Bex\Behat\ExtensionDriverLocator\DriverClassValidator;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
 class DriverNodeBuilder
 {
     /**
-     * @var ClassNameResolver
+     * @var DriverClassNameResolver
      */
     private $driverClassNameResolver;
 
     /**
-     * @param ClassNameResolver $driverClassNameResolver
+     * @param DriverClassNameResolver $driverClassNameResolver
      */
-    public function __construct(ClassNameResolver $driverClassNameResolver)
+    public function __construct(DriverClassNameResolver $driverClassNameResolver)
     {
         $this->driverClassNameResolver = $driverClassNameResolver;
     }
@@ -29,7 +29,7 @@ public function __construct(ClassNameResolver $driverClassNameResolver)
      */
     public static function getInstance($namespace, $parent = '')
     {
-        return new self(new ClassNameResolver($namespace, new ClassValidator($parent)));
+        return new self(new DriverClassNameResolver($namespace, new DriverClassValidator($parent)));
     }
 
     /**