[Feature] Add private properties interception (#412)

Add ability to intercept private properties in the classes, see #411

Author: lisachenko

demos/Demo/Aspect/PropertyInterceptorAspect.php

@@ -28,7 +28,7 @@ class PropertyInterceptorAspect implements Aspect
      *
      * @param FieldAccess $fieldAccess Joinpoint
      *
-     * @Around("access(public|protected Demo\Example\PropertyDemo->*)")
+     * @Around("access(public|protected|private Demo\Example\PropertyDemo->*)")
      * @return mixed
      */
     public function aroundFieldAccess(FieldAccess $fieldAccess)

demos/Demo/Example/PropertyDemo.php

@@ -20,6 +20,8 @@ class PropertyDemo
 
     protected $protectedProperty = 456;
 
+    private $privateProperty = 'test';
+
     protected $indirectModificationCheck = [4, 5, 6];
 
     public function showProtected()
@@ -38,5 +40,6 @@ public function __construct()
         if (count($this->indirectModificationCheck) !== 6) {
             throw new \RuntimeException("Indirect modification doesn't work!");
         }
+        $this->privateProperty = $this->privateProperty . 'bar';
     }
 }

src/Aop/Framework/ClassFieldAccess.php

@@ -117,18 +117,24 @@ public function &getValueToSet()
      */
     public function ensureScopeRule(int $stackLevel = 2): void
     {
-        $property = $this->reflectionProperty;
-
-        if ($property->isProtected()) {
+        $property    = $this->reflectionProperty;
+        $isProtected = $property->isProtected();
+        $isPrivate   = $property->isPrivate();
+        if ($isProtected || $isPrivate) {
             $backTrace     = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $stackLevel+1);
             $accessor      = $backTrace[$stackLevel] ?? [];
             $propertyClass = $property->class;
             if (isset($accessor['class'])) {
-                if ($accessor['class'] === $propertyClass || is_subclass_of($accessor['class'], $propertyClass)) {
+                // For private and protected properties its ok to access from the same class
+                if ($accessor['class'] === $propertyClass) {
+                    return;
+                }
+                // For protected properties its ok to access from any subclass
+                if ($isProtected && is_subclass_of($accessor['class'], $propertyClass)) {
                     return;
                 }
             }
-            throw new AspectException("Cannot access protected property {$propertyClass}::{$property->name}");
+            throw new AspectException("Cannot access property {$propertyClass}::{$property->name}");
         }
     }
 

src/Core/AdviceMatcher.php

@@ -156,7 +156,7 @@ private function getAdvicesFromAdvisor(
 
         // Check properties in class only for property filters
         if ($filterKind & Aop\PointFilter::KIND_PROPERTY) {
-            $mask = ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED;
+            $mask = ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED | ReflectionProperty::IS_PRIVATE;
             foreach ($class->getProperties($mask) as $property) {
                 if ($filter->matches($property, $class) && !$property->isStatic()) {
                     $classAdvices[AspectContainer::PROPERTY_PREFIX][$property->name][$advisorId] = $advisor->getAdvice();

src/Proxy/Part/InterceptedConstructorGenerator.php

@@ -85,16 +85,19 @@ private function getConstructorBody(array $interceptedProperties): string
         $assocProperties = [];
         $listProperties  = [];
         foreach ($interceptedProperties as $propertyName) {
-            $assocProperties[] = "    '{$propertyName}' => &\$this->{$propertyName}";
-            $listProperties[]  = "    \$this->{$propertyName}";
+            $assocProperties[] = "        '{$propertyName}' => &\$target->{$propertyName}";
+            $listProperties[]  = "        \$target->{$propertyName}";
         }
         $lines = [
-            '$this->__properties = [',
+            '$accessor = function(array &$propertyStorage, object $target) {',
+            '    $propertyStorage = [',
             implode(',' . PHP_EOL, $assocProperties),
-            '];',
-            'unset(',
+            '    ];',
+            '    unset(',
             implode(',' . PHP_EOL, $listProperties),
-            ');'
+            '    );',
+            '};',
+            '($accessor->bindTo($this, parent::class))($this->__properties, $this);'
         ];
 
         return implode(PHP_EOL, $lines);

tests/Go/Proxy/Part/InterceptedConstructorGeneratorTest.php

@@ -93,14 +93,17 @@ public function testGenerateWithProperties(): void
         $expectedCode  = preg_replace('/^\s+|\s+$/m', '', '
             public function __construct()
             {
-                $this->__properties = [
-                    \'foo\' => &$this->foo,
-                    \'bar\' => &$this->bar
-                ];
-                unset(
-                    $this->foo,
-                    $this->bar
-                );
+                $accessor = function(array &$propertyStorage, object $target) {
+                    $propertyStorage = [
+                        \'foo\' => &$target->foo,
+                        \'bar\' => &$target->bar
+                    ];
+                    unset(
+                        $target->foo,
+                        $target->bar
+                    );
+                };
+                ($accessor->bindTo($this, parent::class))($this->__properties, $this);
             }'
         );
         $this->assertSame($expectedCode, $generatedCode);