Merge pull request #33 from lisachenko/refactoring

Refactoring of className property for invocations, some cleaning and improvements
goaop · Jan 19, 2013 · 3ba1fd8 · 3ba1fd8
2 parents 0bb2c82 + 8f74206
commit 3ba1fd8
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 230 deletions.
diff --git a/src/Go/Aop/Framework/AbstractConstructorInvocation.php b/src/Go/Aop/Framework/AbstractConstructorInvocation.php
diff --git a/src/Go/Aop/Framework/AbstractJoinpoint.php b/src/Go/Aop/Framework/AbstractJoinpoint.php
@@ -28,19 +28,30 @@
  */
 abstract class AbstractJoinpoint implements Joinpoint
 {
-    /** @var array|Advice[] */
+    /**
+     * List of advices
+     *
+     * @var array|Advice[]
+     */
     protected $advices = array();
 
     /**
-     * Initializes list of advices for current joinpoint
+     * Name of the invocation class
      *
-     * @param array $advices
+     * @var string
+     */
+    protected $className = '';
+
+    /**
+     * Initializes list of advices for current joinpoint
      *
-     * @return AbstractJoinpoint
+     * @param string $className Name of the class
+     * @param array $advices List of advices
      */
-    protected function __construct(array $advices)
+    protected function __construct($className, array $advices)
     {
-        $this->advices = static::sortAdvices($advices);
+        $this->className = $className;
+        $this->advices   = static::sortAdvices($advices);
     }
 
     /**

diff --git a/src/Go/Aop/Framework/AbstractMethodInvocation.php b/src/Go/Aop/Framework/AbstractMethodInvocation.php
@@ -29,13 +29,6 @@ abstract class AbstractMethodInvocation extends AbstractInvocation implements Me
      */
     protected $instance = null;
 
-    /**
-     * Name of the parent class
-     *
-     * @var string
-     */
-    protected $parentClass = '';
-
     /**
      * Instance of reflection method for class
      *
@@ -46,21 +39,19 @@ abstract class AbstractMethodInvocation extends AbstractInvocation implements Me
     /**
      * Constructor for method invocation
      *
-     * @param string|object $classNameOrObject Class name or object instance
+     * @param string $className Class name
      * @param string $methodName Method to invoke
      * @param $advices array List of advices for this invocation
      */
-    public function __construct($classNameOrObject, $methodName, array $advices)
+    public function __construct($className, $methodName, array $advices)
     {
-        $this->parentClass      = get_parent_class($classNameOrObject);
-        $this->reflectionMethod = $method = new ReflectionMethod($this->parentClass, $methodName);
+        parent::__construct($className, $advices);
+        $this->reflectionMethod = $method = new ReflectionMethod($this->className, $methodName);
 
         // Give an access to call protected method
         if ($method->isProtected()) {
             $method->setAccessible(true);
         }
-
-        parent::__construct($advices);
     }
 
     /**

diff --git a/src/Go/Aop/Framework/ClassFieldAccess.php b/src/Go/Aop/Framework/ClassFieldAccess.php
@@ -29,13 +29,6 @@ class ClassFieldAccess extends AbstractJoinpoint implements FieldAccess
         self::WRITE => 'set'
     );
 
-    /**
-     * Name of the class
-     *
-     * @var object|string
-     */
-    protected $classOrObject = null;
-
     /**
      * Name of the field
      *
@@ -81,15 +74,14 @@ class ClassFieldAccess extends AbstractJoinpoint implements FieldAccess
     /**
      * Constructor for field access
      *
-     * @param string|object $classNameOrObject Class name or object instance
+     * @param string $className Class name
      * @param string $fieldName Field name
      * @param $advices array List of advices for this invocation
      */
-    public function __construct($classNameOrObject, $fieldName, array $advices)
+    public function __construct($className, $fieldName, array $advices)
     {
-        $this->classOrObject = $classNameOrObject;
-        $this->fieldName     = $fieldName;
-        parent::__construct($advices);
+        parent::__construct($className, $advices);
+        $this->fieldName = $fieldName;
     }
 
     /**
@@ -113,7 +105,7 @@ public function getAccessType()
     public function getField()
     {
         if (!$this->reflectionProperty) {
-            $this->reflectionProperty = new ReflectionProperty($this->classOrObject, $this->fieldName);
+            $this->reflectionProperty = new ReflectionProperty($this->className, $this->fieldName);
             // Give an access to protected field
             if ($this->reflectionProperty->isProtected()) {
                 $this->reflectionProperty->setAccessible(true);

diff --git a/src/Go/Aop/Framework/ClosureDynamicMethodInvocation.php b/src/Go/Aop/Framework/ClosureDynamicMethodInvocation.php
@@ -31,22 +31,6 @@ class ClosureDynamicMethodInvocation extends AbstractMethodInvocation
      */
     private $previousInstance = null;
 
-    /**
-     * Shortcut for ReflectionMethod->name
-     *
-     * @var string
-     */
-    private $methodName = '';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($classNameOrObject, $methodName, array $advices)
-    {
-        parent::__construct($classNameOrObject, $methodName, $advices);
-        $this->methodName    = $methodName;
-    }
-
     /**
      * Invokes original method and return result from it
      *
@@ -67,7 +51,7 @@ public function proceed()
 
         // Rebind the closure if instance was changed since last time
         if ($this->previousInstance !== $this->instance) {
-            $this->closureToCall    = $this->closureToCall->bindTo($this->instance, $this->parentClass);
+            $this->closureToCall    = $this->closureToCall->bindTo($this->instance, $this->className);
             $this->previousInstance = $this->instance;
         }
 

diff --git a/src/Go/Aop/Framework/ClosureStaticMethodInvocation.php b/src/Go/Aop/Framework/ClosureStaticMethodInvocation.php
@@ -34,10 +34,10 @@ class ClosureStaticMethodInvocation extends AbstractMethodInvocation
     /**
      * {@inheritdoc}
      */
-    public function __construct($classNameOrObject, $methodName, array $advices)
+    public function __construct($className, $methodName, array $advices)
     {
-        parent::__construct($classNameOrObject, $methodName, $advices);
-        $this->closureToCall = $this->getStaticInvoker($this->parentClass, $methodName);
+        parent::__construct($className, $methodName, $advices);
+        $this->closureToCall = $this->getStaticInvoker($this->className, $methodName);
     }
 
     /**
@@ -68,15 +68,15 @@ public function proceed()
     /**
      * Returns static method invoker
      *
-     * @param string $parent Parent class name to forward request
+     * @param string $className Class name to forward request
      * @param string $method Method name to call
      *
-     * @return callable
+     * @return \Closure
      */
-    protected static function getStaticInvoker($parent, $method)
+    protected static function getStaticInvoker($className, $method)
     {
-        return function (array $args) use ($parent, $method) {
-            return forward_static_call_array(array($parent, $method), $args);
+        return function (array $args) use ($className, $method) {
+            return forward_static_call_array(array($className, $method), $args);
         };
     }
 }