refactoring callable and comparable

DelegateInterface.php → AbstractCallable.php

@@ -12,21 +12,11 @@
 namespace Cubiche\Core\Delegate;
 
 /**
- * Delegate Interface.
+ * Abstract Callable class.
  *
  * @author Karel Osorio Ramírez <osorioramirez@gmail.com>
  */
-interface DelegateInterface extends CallableInterface
+abstract class AbstractCallable implements CallableInterface
 {
-    /**
-     * @return mixed
-     */
-    public function __invoke();
-
-    /**
-     * @param array $args
-     *
-     * @return mixed
-     */
-    public function invokeWith(array $args);
+    use CallableTrait;
 }

CallableInterface.php

@@ -22,4 +22,11 @@ interface CallableInterface
      * @return mixed
      */
     public function __invoke();
+
+    /**
+     * @param array $args
+     *
+     * @return mixed
+     */
+    public function invokeWith(array $args);
 }

CallableTrait.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Cubiche package.
+ *
+ * Copyright (c) Cubiche
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Cubiche\Core\Delegate;
+
+/**
+ * Callable trait.
+ *
+ * @author Karel Osorio Ramírez <osorioramirez@gmail.com>
+ */
+trait CallableTrait
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke()
+    {
+        return $this->invokeWith(\func_get_args());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function invokeWith(array $args)
+    {
+        return \call_user_func_array($this->innerCallable(), $args);
+    }
+
+    /**
+     * @return callable
+     */
+    abstract protected function innerCallable();
+}

Delegate.php

@@ -16,13 +16,18 @@
  *
  * @author Karel Osorio Ramírez <osorioramirez@gmail.com>
  */
-class Delegate extends AbstractDelegate
+class Delegate extends AbstractCallable
 {
     /**
      * @var \ReflectionFunction|\ReflectionMethod
      */
     private $reflection = null;
 
+    /**
+     * @var callable
+     */
+    protected $callable;
+
     /**
      * @param Closure $closure
      *
@@ -65,6 +70,22 @@ public static function fromFunction($function)
         return new static($function);
     }
 
+    /**
+     * @param callable $callable
+     */
+    public function __construct($callable)
+    {
+        if (!\is_callable($callable)) {
+            throw new \InvalidArgumentException('The $callable argument must be a callable.');
+        }
+
+        if (\is_string($callable) && \strpos($callable, '::')) {
+            $callable = explode('::', $callable);
+        }
+
+        $this->callable = $callable;
+    }
+
     /**
      * @return \ReflectionFunction|\ReflectionMethod
      */
@@ -82,4 +103,20 @@ public function reflection()
 
         return $this->reflection;
     }
+
+    /**
+     * @return callable
+     */
+    public function getCallable()
+    {
+        return $this->callable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function innerCallable()
+    {
+        return $this->getCallable();
+    }
 }

Tests/Fixtures/FooCallable.php

@@ -25,4 +25,12 @@ public function __invoke()
     {
         return 'foo';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function invokeWith(array $args)
+    {
+        return \call_user_func_array($this, $args);
+    }
 }