Merge branch 'release/2.2.4'

Behat · Aug 3, 2012 · 1887a8c · 1887a8c
2 parents d719d27 + 47d5a0c
commit 1887a8c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+2.2.4 / 2012-08-03
+==================
+
+  * Fixed exception message for "no loader found"
+
 2.2.3 / 2012-08-03
 ==================
 

diff --git a/src/Behat/Gherkin/Gherkin.php b/src/Behat/Gherkin/Gherkin.php
@@ -94,7 +94,16 @@ public function load($resource, array $filters = array())
         $loader = $this->resolveLoader($resource);
 
         if (null === $loader) {
-            throw new \InvalidArgumentException(sprintf('Can\'t find loader for resource: %s', $resource));
+            if ($resource) {
+                $message = sprintf('Can\'t find applicable feature loader for: "%s"', $resource);
+            } else {
+                $message = sprintf('Can\'t find applicable feature loader');
+            }
+
+            throw new \InvalidArgumentException(
+                $message."\n".
+                'Maybe you\'ve forgot to create `features/` folder?'
+            );
         }
 
         $features = $loader->load($resource);