CallableType refactoring

Author: Cosmologist

Type/CallableType.php

@@ -8,36 +8,31 @@
 class CallableType extends GearsCallableType
 {
     /**
-     * {@inheritDoc}
+     * Creates and returns callable from a string expression
+     *
+     * Supports reference to container services:
+     * - 'foo.bar::baz' - returns the callable for the service identified "foo.bar" (Symfony 2.x style) and the "baz" method
+     * - 'Foo\Bar::baz' - returns the callable for the service identified "Foo\Bar" (Symfony 3.x style) and method "baz"
+     *
+     * @return callable
      */
-    public static function parse(string $expression): callable
+    public static function toCallable(string $expression): callable
     {
-        if (self::validateServiceCallable($expression) === false) {
-            return parent::parse($expression);
+        if (parent::validate($expression)) {
+            return $expression;
         }
 
-        [$id, $method] = self::parseComposite($expression);
-
-        return [ContainerStatic::get($id), $method];
+        // It uses closure to avoid initializing unnecessary services (when calling Container::get)
+        return function (...$args) use ($expression) {
+            return call_user_func_array([ContainerStatic::get(self::extractClassFromExpression($expression)), self::extractMethodFromExpression($expression)], $args);
+        };
     }
 
     /**
      * {@inheritDoc}
      */
     public static function validate(string $expression): bool
     {
-        return self::validateServiceCallable($expression) || parent::validate($expression);
-    }
-
-    /**
-     * @param string $expression
-     *
-     * @return bool
-     */
-    private static function validateServiceCallable(string $expression)
-    {
-        [$id, $method] = self::parseComposite($expression);
-
-        return self::isCompositeFormat($expression) && ContainerStatic::has($id) && method_exists(ContainerStatic::get($id), $method);
+        return parent::validate($expression) || (self::isCompositeFormat($expression) && ContainerStatic::has(self::extractClassFromExpression($expression)));
     }
 }

composer.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "require": {
     "php": ">=5.4",
-    "cosmologist/gears": "^2.7.0"
+    "cosmologist/gears": "^3.0.0"
   },
   "autoload": {
     "psr-4": {