toActionClass method

corneltek · Apr 26, 2014 · 4b59ca4 · 4b59ca4
1 parent 6ca92fb
commit 4b59ca4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ActionKit/ActionRunner.php b/src/ActionKit/ActionRunner.php
@@ -89,13 +89,12 @@ public function __construct($options = array()) {
      * */
     public function run($actionName, $arguments = array() )
     {
-        if ( $this->isInvalidActionName( $actionName ) ) {
+        if ( ! Utils::validateActionName( $actionName ) ) {
             throw new Exception( "Invalid action name: $actionName." );
         }
 
         /* translate :: into php namespace */
-        $class = $this->getActionClass( $actionName );
-
+        $class = Utils::toActionClass($actionName);
 
         /* register results into hash */
         if ( $action = $this->createAction( $class , $arguments ) ) {

diff --git a/src/ActionKit/Utils.php b/src/ActionKit/Utils.php
@@ -9,6 +9,11 @@ class Utils
     public static function validateActionName($actionName) {
         return ! preg_match( '/[^A-Za-z0-9:]/i' , $actionName  );
     }
+
+    public static function toActionClass( $sig ) {
+        // replace :: with '\'
+        return str_replace( '::' , '\\' , $sig );
+    }
 }