Lazy-loading of ghost objects only via properties access (no method overrides)

src/ProxyManager/ProxyGenerator/LazyLoading/MethodGenerator/StaticProxyConstructor.php

@@ -20,7 +20,7 @@
 
 use ProxyManager\Generator\MethodGenerator;
 use ProxyManager\Generator\ParameterGenerator;
-use ReflectionClass;
+use ProxyManager\ProxyGenerator\Util\Properties;
 use ReflectionProperty;
 use Zend\Code\Generator\PropertyGenerator;
 
@@ -33,33 +33,70 @@
 class StaticProxyConstructor extends MethodGenerator
 {
     /**
-     * Constructor
+     * Static constructor
      *
-     * @param ReflectionClass   $originalClass
      * @param PropertyGenerator $initializerProperty
+     * @param Properties        $properties
      */
-    public function __construct(ReflectionClass $originalClass, PropertyGenerator $initializerProperty)
+    public function __construct(PropertyGenerator $initializerProperty, Properties $properties)
     {
         parent::__construct('staticProxyConstructor', [], static::FLAG_PUBLIC | static::FLAG_STATIC);
 
         $this->setParameter(new ParameterGenerator('initializer'));
 
-        /* @var $publicProperties \ReflectionProperty[] */
-        $publicProperties = $originalClass->getProperties(ReflectionProperty::IS_PUBLIC);
-        $unsetProperties  = [];
-
-        foreach ($publicProperties as $publicProperty) {
-            $unsetProperties[] = '$instance->' . $publicProperty->getName();
-        }
-
         $this->setDocblock("Constructor for lazy initialization\n\n@param \\Closure|null \$initializer");
         $this->setBody(
             'static $reflection;' . "\n\n"
             . '$reflection = $reflection ?: $reflection = new \ReflectionClass(__CLASS__);' . "\n"
             . '$instance = (new \ReflectionClass(get_class()))->newInstanceWithoutConstructor();' . "\n\n"
-            . ($unsetProperties ? 'unset(' . implode(', ', $unsetProperties) . ");\n\n" : '')
+            . $this->generateUnsetPropertiesCode($properties)
             . '$instance->' . $initializerProperty->getName() . ' = $initializer;' . "\n\n"
             . 'return $instance;'
         );
     }
+
+    /**
+     * @param Properties $properties
+     *
+     * @return string
+     */
+    private function generateUnsetPropertiesCode(Properties $properties)
+    {
+        $code = '';
+
+        if ($accessibleProperties = $properties->getAccessibleProperties()) {
+            $code .= $this->getUnsetPropertiesGroupCode($accessibleProperties) . "\n";
+        }
+
+        foreach ($properties->getGroupedPrivateProperties() as $className => $privateProperties) {
+            $cacheKey = 'cache' . str_replace('\\', '_', $className);
+            $code    .= 'static $' . $cacheKey . ";\n\n"
+                . '$' . $cacheKey . ' ?: $' . $cacheKey . " = \\Closure::bind(function (\$instance) {\n"
+                . '    ' . $this->getUnsetPropertiesGroupCode($privateProperties)
+                . '}, null, ' . var_export($className, true) . ");\n\n"
+                . '$' . $cacheKey . "(\$instance);\n\n";
+        }
+
+        return $code;
+    }
+
+    /**
+     * @param ReflectionProperty[] $properties
+     *
+     * @return string
+     */
+    private function getUnsetPropertiesGroupCode(array $properties)
+    {
+        return 'unset('
+            . implode(
+                ', ',
+                array_map(
+                    function (ReflectionProperty $property) {
+                        return '$instance->' . $property->getName();
+                    },
+                    $properties
+                )
+            )
+            . ");\n";
+    }
 }

src/ProxyManager/ProxyGenerator/LazyLoadingGhost/MethodGenerator/CallInitializer.php

@@ -21,6 +21,8 @@
 use ProxyManager\Generator\MethodGenerator;
 use ProxyManager\Generator\ParameterGenerator;
 use ProxyManager\Generator\Util\UniqueIdentifierGenerator;
+use ProxyManager\ProxyGenerator\Util\Properties;
+use ReflectionProperty;
 use Zend\Code\Generator\PropertyGenerator;
 
 /**
@@ -36,13 +38,13 @@ class CallInitializer extends MethodGenerator
      * Constructor
      *
      * @param PropertyGenerator $initializerProperty
-     * @param PropertyGenerator $publicPropsDefaults
      * @param PropertyGenerator $initTracker
+     * @param Properties        $properties
      */
     public function __construct(
         PropertyGenerator $initializerProperty,
-        PropertyGenerator $publicPropsDefaults,
-        PropertyGenerator $initTracker
+        PropertyGenerator $initTracker,
+        Properties $properties
     ) {
         parent::__construct(UniqueIdentifierGenerator::getIdentifier('callInitializer'));
         $this->setDocblock("Triggers initialization logic for this ghost object");
@@ -57,15 +59,141 @@ public function __construct(
         $initializer    = $initializerProperty->getName();
         $initialization = $initTracker->getName();
 
-        $this->setBody(
-            'if ($this->' . $initialization . ' || ! $this->' . $initializer . ') {' . "\n    return;\n}\n\n"
-            . "\$this->" . $initialization . " = true;\n\n"
-            . "foreach (self::\$" . $publicPropsDefaults->getName() . " as \$key => \$default) {\n"
-            . "    \$this->\$key = \$default;\n"
-            . "}\n\n"
-            . '$this->' . $initializer . '->__invoke'
-            . '($this, $methodName, $parameters, $this->' . $initializer . ');' . "\n\n"
-            . "\$this->" . $initialization . " = false;"
+        $bodyTemplate = <<<'PHP'
+if ($this->%s || ! $this->%s) {
+    return;
+}
+
+$this->%s = true;
+
+%s
+%s
+
+$this->%s->__invoke($this, $methodName, $parameters, $this->%s, $properties);
+$this->%s = false;
+PHP;
+
+        $this->setBody(sprintf(
+            $bodyTemplate,
+            $initialization,
+            $initializer,
+            $initialization,
+            $this->propertiesInitializationCode($properties),
+            $this->propertiesReferenceArrayCode($properties),
+            $initializer,
+            $initializer,
+            $initialization
+        ));
+    }
+
+    /**
+     * @param Properties $properties
+     *
+     * @return string
+     */
+    private function propertiesInitializationCode(Properties $properties)
+    {
+        $assignments = [];
+
+        foreach ($properties->getAccessibleProperties() as $property) {
+            $assignments[] = '$this->'
+                . $property->getName()
+                . ' = ' . $this->getExportedPropertyDefaultValue($property)
+                . ';';
+        }
+
+
+        foreach ($properties->getGroupedPrivateProperties() as $className => $privateProperties) {
+            $cacheKey      = 'cache' . str_replace('\\', '_', $className);
+            $assignments[] = 'static $' . $cacheKey . ";\n\n"
+                . '$' . $cacheKey . ' ?: $' . $cacheKey . " = \\Closure::bind(function (\$instance) {\n"
+                . $this->getPropertyDefaultsAssignments($privateProperties) . "\n"
+                . '}, null, ' . var_export($className, true) . ");\n\n"
+                . '$' . $cacheKey . "(\$this);\n\n";
+        }
+
+        return implode("\n", $assignments) . "\n\n";
+    }
+
+    /**
+     * @param ReflectionProperty[] $properties
+     *
+     * @return string
+     */
+    private function getPropertyDefaultsAssignments(array $properties)
+    {
+        return implode(
+            "\n",
+            array_map(
+                function (ReflectionProperty $property) {
+                    return '    $instance->' . $property->getName()
+                        . ' = ' . $this->getExportedPropertyDefaultValue($property) . ';';
+                },
+                $properties
+            )
         );
     }
+
+    /**
+     * @param Properties $properties
+     *
+     * @return string
+     */
+    private function propertiesReferenceArrayCode(Properties $properties)
+    {
+        $assignments = [];
+
+        foreach ($properties->getAccessibleProperties() as $propertyInternalName => $property) {
+            $assignments[] = '    '
+                . var_export($propertyInternalName, true) . ' => & $this->' . $property->getName()
+                . ',';
+        }
+
+        $code = "\$properties = [\n" . implode("\n", $assignments) . "\n];\n\n";
+
+        // must use assignments, as direct reference during array definition causes a fatal error (not sure why)
+        foreach ($properties->getGroupedPrivateProperties() as $className => $classPrivateProperties) {
+            $cacheKey  = 'cacheFetch' . str_replace('\\', '_', $className);
+
+            $code .= 'static $' . $cacheKey . ";\n\n"
+                . '$' . $cacheKey . ' ?: $' . $cacheKey
+                . " = \\Closure::bind(function (\$instance, array & \$properties) {\n"
+                . $this->generatePrivatePropertiesAssignmentsCode($classPrivateProperties)
+                . "}, \$this, " . var_export($className, true) . ");\n\n"
+                . '$' . $cacheKey . "(\$this, \$properties);";
+        }
+
+        return $code;
+    }
+
+    /**
+     * @param ReflectionProperty[] $properties indexed by internal name
+     *
+     * @return string
+     */
+    private function generatePrivatePropertiesAssignmentsCode(array $properties)
+    {
+        $code = '';
+
+        foreach ($properties as $property) {
+            $key   = "\0" . $property->getDeclaringClass()->getName() . "\0" . $property->getName();
+            $code .= '    $properties[' . var_export($key, true) . '] = '
+                . '& $instance->' . $property->getName() . ";\n";
+        }
+
+        return $code;
+    }
+
+    /**
+     * @param ReflectionProperty $property
+     *
+     * @return string
+     */
+    private function getExportedPropertyDefaultValue(ReflectionProperty $property)
+    {
+        $name     = $property->getName();
+        $defaults = $property->getDeclaringClass()->getDefaultProperties();
+
+        return var_export(isset($defaults[$name]) ? $defaults[$name] : null, true);
+    }
 }