Merge pull request #175 from Ocramius/hotfix/avoid-constructor-override

Avoid constructor override

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.3.3
-  - 5.3
   - 5.4
   - 5.5
   - 5.6

composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php":                     ">=5.3.3",
+        "php":                     "~5.4",
         "zendframework/zend-code": ">2.2.5,<3.0"
     },
     "require-dev": {
@@ -28,6 +28,7 @@
         "squizlabs/php_codesniffer":   "1.5.*"
     },
     "suggest": {
+        "php": ">5.6 if you work with internal PHP classes, as reflection instantiation does not work with older PHP versions",
         "zendframework/zend-stdlib":   "To use the hydrator proxy",
         "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
         "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)",

src/ProxyManager/Factory/AbstractLazyFactory.php

@@ -41,6 +41,6 @@ public function createProxy($className, Closure $initializer)
     {
         $proxyClassName = $this->generateProxy($className);
 
-        return new $proxyClassName($initializer);
+        return $proxyClassName::staticProxyConstructor($initializer);
     }
 }

src/ProxyManager/Factory/AccessInterceptorScopeLocalizerFactory.php

@@ -46,7 +46,7 @@ public function createProxy($instance, array $prefixInterceptors = array(), arra
     {
         $proxyClassName = $this->generateProxy(get_class($instance));
 
-        return new $proxyClassName($instance, $prefixInterceptors, $suffixInterceptors);
+        return $proxyClassName::staticProxyConstructor($instance, $prefixInterceptors, $suffixInterceptors);
     }
 
     /**

src/ProxyManager/Factory/AccessInterceptorValueHolderFactory.php

@@ -46,7 +46,7 @@ public function createProxy($instance, array $prefixInterceptors = array(), arra
     {
         $proxyClassName = $this->generateProxy(get_class($instance));
 
-        return new $proxyClassName($instance, $prefixInterceptors, $suffixInterceptors);
+        return $proxyClassName::staticProxyConstructor($instance, $prefixInterceptors, $suffixInterceptors);
     }
 
     /**

src/ProxyManager/Factory/NullObjectFactory.php

@@ -43,7 +43,7 @@ public function createProxy($instanceOrClassName)
         $className      = is_object($instanceOrClassName) ? get_class($instanceOrClassName) : $instanceOrClassName;
         $proxyClassName = $this->generateProxy($className);
 
-        return new $proxyClassName();
+        return $proxyClassName::staticProxyConstructor();
     }
 
     /**

src/ProxyManager/Factory/RemoteObjectFactory.php

@@ -60,10 +60,11 @@ public function __construct(AdapterInterface $adapter, Configuration $configurat
      */
     public function createProxy($instanceOrClassName)
     {
-        $className      = is_object($instanceOrClassName) ? get_class($instanceOrClassName) : $instanceOrClassName;
-        $proxyClassName = $this->generateProxy($className);
+        $proxyClassName = $this->generateProxy(
+            is_object($instanceOrClassName) ? get_class($instanceOrClassName) : $instanceOrClassName
+        );
 
-        return new $proxyClassName($this->adapter);
+        return $proxyClassName::staticProxyConstructor($this->adapter);
     }
 
     /**

src/ProxyManager/ProxyGenerator/AccessInterceptor/MethodGenerator/MagicWakeup.php

@@ -32,6 +32,8 @@ class MagicWakeup extends MagicMethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param ReflectionClass $originalClass
      */
     public function __construct(ReflectionClass $originalClass)
     {

src/ProxyManager/ProxyGenerator/AccessInterceptor/MethodGenerator/SetMethodPrefixInterceptor.php

@@ -33,6 +33,8 @@ class SetMethodPrefixInterceptor extends MethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param PropertyGenerator $prefixInterceptor
      */
     public function __construct(PropertyGenerator $prefixInterceptor)
     {

src/ProxyManager/ProxyGenerator/AccessInterceptor/MethodGenerator/SetMethodSuffixInterceptor.php

@@ -33,6 +33,8 @@ class SetMethodSuffixInterceptor extends MethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param PropertyGenerator $suffixInterceptor
      */
     public function __construct(PropertyGenerator $suffixInterceptor)
     {

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/BindProxyProperties.php

@@ -0,0 +1,96 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ */
+
+namespace ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator;
+
+use ProxyManager\Exception\UnsupportedProxiedClassException;
+use ProxyManager\Generator\MethodGenerator;
+use ProxyManager\Generator\ParameterGenerator;
+use ReflectionClass;
+use Zend\Code\Generator\PropertyGenerator;
+
+/**
+ * The `bindProxyProperties` method implementation for access interceptor scope localizers
+ *
+ * @author Marco Pivetta <ocramius@gmail.com>
+ * @license MIT
+ */
+class BindProxyProperties extends MethodGenerator
+{
+    /**
+     * Constructor
+     *
+     * @param ReflectionClass   $originalClass
+     * @param PropertyGenerator $prefixInterceptors
+     * @param PropertyGenerator $suffixInterceptors
+     */
+    public function __construct(
+        ReflectionClass $originalClass,
+        PropertyGenerator $prefixInterceptors,
+        PropertyGenerator $suffixInterceptors
+    ) {
+        parent::__construct('bindProxyProperties', array(), static::FLAG_PRIVATE);
+
+        $localizedObject = new ParameterGenerator('localizedObject');
+        $prefix          = new ParameterGenerator('prefixInterceptors');
+        $suffix          = new ParameterGenerator('suffixInterceptors');
+
+        $localizedObject->setType($originalClass->getName());
+        $prefix->setDefaultValue(array());
+        $suffix->setDefaultValue(array());
+        $prefix->setType('array');
+        $suffix->setType('array');
+
+        $this->setParameter($localizedObject);
+        $this->setParameter($prefix);
+        $this->setParameter($suffix);
+
+        $localizedProperties = array();
+
+        foreach ($originalClass->getProperties() as $originalProperty) {
+            if ((! method_exists('Closure', 'bind')) && $originalProperty->isPrivate()) {
+                // @codeCoverageIgnoreStart
+                throw UnsupportedProxiedClassException::unsupportedLocalizedReflectionProperty($originalProperty);
+                // @codeCoverageIgnoreEnd
+            }
+
+            $propertyName = $originalProperty->getName();
+
+            if ($originalProperty->isPrivate()) {
+                $localizedProperties[] = "\\Closure::bind(function () use (\$localizedObject) {\n    "
+                    . '$this->' . $propertyName . ' = & $localizedObject->' . $propertyName . ";\n"
+                    . '}, $this, ' . var_export($originalProperty->getDeclaringClass()->getName(), true)
+                    . ')->__invoke();';
+            } else {
+                $localizedProperties[] = '$this->' . $propertyName . ' = & $localizedObject->' . $propertyName . ";";
+            }
+        }
+
+        $this->setDocblock(
+            "@override constructor to setup interceptors\n\n"
+            . "@param \\" . $originalClass->getName() . " \$localizedObject\n"
+            . "@param \\Closure[] \$prefixInterceptors method interceptors to be used before method logic\n"
+            . "@param \\Closure[] \$suffixInterceptors method interceptors to be used before method logic"
+        );
+        $this->setBody(
+            (empty($localizedProperties) ? '' : implode("\n\n", $localizedProperties) . "\n\n")
+            . '$this->' . $prefixInterceptors->getName() . " = \$prefixInterceptors;\n"
+            . '$this->' . $suffixInterceptors->getName() . " = \$suffixInterceptors;"
+        );
+    }
+}

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/Constructor.php

@@ -34,6 +34,10 @@ class Constructor extends MethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param ReflectionClass   $originalClass
+     * @param PropertyGenerator $prefixInterceptors
+     * @param PropertyGenerator $suffixInterceptors
      */
     public function __construct(
         ReflectionClass $originalClass,

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicClone.php

@@ -33,6 +33,10 @@ class MagicClone extends MagicMethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param ReflectionClass   $originalClass
+     * @param PropertyGenerator $prefixInterceptors
+     * @param PropertyGenerator $suffixInterceptors
      */
     public function __construct(
         ReflectionClass $originalClass,

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicSleep.php

@@ -33,6 +33,10 @@ class MagicSleep extends MagicMethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param ReflectionClass   $originalClass
+     * @param PropertyGenerator $prefixInterceptors
+     * @param PropertyGenerator $suffixInterceptors
      */
     public function __construct(
         ReflectionClass $originalClass,

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

@@ -0,0 +1,71 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ */
+
+namespace ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator;
+
+use ProxyManager\Generator\MethodGenerator;
+use ProxyManager\Generator\ParameterGenerator;
+use ReflectionClass;
+
+/**
+ * The `staticProxyConstructor` implementation for an access interceptor scope localizer proxy
+ *
+ * @author Marco Pivetta <ocramius@gmail.com>
+ * @license MIT
+ */
+class StaticProxyConstructor extends MethodGenerator
+{
+    /**
+     * Constructor
+     *
+     * @param ReflectionClass $originalClass
+     */
+    public function __construct(ReflectionClass $originalClass)
+    {
+        parent::__construct('staticProxyConstructor', array(), static::FLAG_PUBLIC | static::FLAG_STATIC);
+
+        $localizedObject = new ParameterGenerator('localizedObject');
+        $prefix          = new ParameterGenerator('prefixInterceptors');
+        $suffix          = new ParameterGenerator('suffixInterceptors');
+
+        $localizedObject->setType($originalClass->getName());
+        $prefix->setDefaultValue(array());
+        $suffix->setDefaultValue(array());
+        $prefix->setType('array');
+        $suffix->setType('array');
+
+        $this->setParameter($localizedObject);
+        $this->setParameter($prefix);
+        $this->setParameter($suffix);
+
+        $this->setDocblock(
+            "Constructor to setup interceptors\n\n"
+            . "@param \\" . $originalClass->getName() . " \$localizedObject\n"
+            . "@param \\Closure[] \$prefixInterceptors method interceptors to be used before method logic\n"
+            . "@param \\Closure[] \$suffixInterceptors method interceptors to be used before method logic\n\n"
+            . "@return self"
+        );
+        $this->setBody(
+            'static $reflection;' . "\n\n"
+            . '$reflection = $reflection ?: $reflection = new \ReflectionClass(__CLASS__);' . "\n"
+            . '$instance   = $reflection->newInstanceWithoutConstructor();' . "\n\n"
+            . '$instance->bindProxyProperties($localizedObject, $prefixInterceptors, $suffixInterceptors);' . "\n\n"
+            . 'return $instance;'
+        );
+    }
+}

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizerGenerator.php

@@ -22,14 +22,15 @@
 use ProxyManager\ProxyGenerator\AccessInterceptor\MethodGenerator\SetMethodPrefixInterceptor;
 use ProxyManager\ProxyGenerator\AccessInterceptor\MethodGenerator\SetMethodSuffixInterceptor;
 use ProxyManager\ProxyGenerator\AccessInterceptor\PropertyGenerator\MethodPrefixInterceptors;
-use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\Constructor;
+use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\BindProxyProperties;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\InterceptedMethod;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\MagicClone;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\MagicGet;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\MagicIsset;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\MagicSet;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\MagicSleep;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\MagicUnset;
+use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\StaticProxyConstructor;
 use ProxyManager\ProxyGenerator\Assertion\CanProxyAssertion;
 use ProxyManager\ProxyGenerator\Util\ProxiedMethodsFilter;
 use ReflectionClass;
@@ -80,7 +81,8 @@ function (ReflectionMethod $method) use ($prefixInterceptors, $suffixInterceptor
                     )
                 ),
                 array(
-                    new Constructor($originalClass, $prefixInterceptors, $suffixInterceptors),
+                    new StaticProxyConstructor($originalClass, $prefixInterceptors, $suffixInterceptors),
+                    new BindProxyProperties($originalClass, $prefixInterceptors, $suffixInterceptors),
                     new SetMethodPrefixInterceptor($prefixInterceptors),
                     new SetMethodSuffixInterceptor($suffixInterceptors),
                     new MagicGet($originalClass, $prefixInterceptors, $suffixInterceptors),

src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolder/MethodGenerator/MagicClone.php

@@ -32,6 +32,11 @@ class MagicClone extends MagicMethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param ReflectionClass   $originalClass
+     * @param PropertyGenerator $valueHolderProperty
+     * @param PropertyGenerator $prefixInterceptors
+     * @param PropertyGenerator $suffixInterceptors
      */
     public function __construct(
         ReflectionClass $originalClass,

src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolder/MethodGenerator/MagicGet.php

@@ -36,6 +36,12 @@ class MagicGet extends MagicMethodGenerator
 {
     /**
      * Constructor
+     *
+     * @param ReflectionClass     $originalClass
+     * @param PropertyGenerator   $valueHolder
+     * @param PropertyGenerator   $prefixInterceptors
+     * @param PropertyGenerator   $suffixInterceptors
+     * @param PublicPropertiesMap $publicProperties
      */
     public function __construct(
         ReflectionClass $originalClass,

src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolder/MethodGenerator/MagicIsset.php

@@ -36,6 +36,11 @@ class MagicIsset extends MagicMethodGenerator
 {
     /**
      * Constructor
+     * @param ReflectionClass     $originalClass
+     * @param PropertyGenerator   $valueHolder
+     * @param PropertyGenerator   $prefixInterceptors
+     * @param PropertyGenerator   $suffixInterceptors
+     * @param PublicPropertiesMap $publicProperties
      */
     public function __construct(
         ReflectionClass $originalClass,

src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolder/MethodGenerator/MagicSet.php

@@ -36,6 +36,11 @@ class MagicSet extends MagicMethodGenerator
 {
     /**
      * Constructor
+     * @param ReflectionClass     $originalClass
+     * @param PropertyGenerator   $valueHolder
+     * @param PropertyGenerator   $prefixInterceptors
+     * @param PropertyGenerator   $suffixInterceptors
+     * @param PublicPropertiesMap $publicProperties
      */
     public function __construct(
         ReflectionClass $originalClass,

src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolder/MethodGenerator/MagicUnset.php

@@ -36,6 +36,11 @@ class MagicUnset extends MagicMethodGenerator
 {
     /**
      * Constructor
+     * @param ReflectionClass     $originalClass
+     * @param PropertyGenerator   $valueHolder
+     * @param PropertyGenerator   $prefixInterceptors
+     * @param PropertyGenerator   $suffixInterceptors
+     * @param PublicPropertiesMap $publicProperties
      */
     public function __construct(
         ReflectionClass $originalClass,