Merge pull request #3 from wkjagt/command-translator

Fix case where command namespace contains Command
laracasts · Jul 3, 2014 · 89b47ce · 89b47ce
2 parents 1f65b8c + e82b9b4
commit 89b47ce
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Laracasts/Commander/BasicCommandTranslator.php b/src/Laracasts/Commander/BasicCommandTranslator.php
@@ -11,7 +11,8 @@ class BasicCommandTranslator implements CommandTranslator {
      */
     public function toCommandHandler($command)
     {
-        $handler = str_replace('Command', 'CommandHandler', get_class($command));
+        $commandClass = get_class($command);
+        $handler = substr_replace($commandClass, 'CommandHandler', strrpos($commandClass, 'Command'));
 
         if ( ! class_exists($handler))
         {
@@ -31,7 +32,8 @@ public function toCommandHandler($command)
      */
     public function toValidator($command)
     {
-        return str_replace('Command', 'Validator', get_class($command));
+        $commandClass = get_class($command);
+        return substr_replace($commandClass, 'Validator', strrpos($commandClass, 'Command'));
     }
 
 }