bug #24906 [Bridge/ProxyManager] Remove direct reference to value holder property (nicolas-grekas)

fabpot · fabpot · commit ae65bd841074 · 2017-11-10T07:28:23.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [Bridge/ProxyManager] Remove direct reference to value holder property | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23110 | License | MIT | Doc PR | - This fixes Ocramius/ProxyManager#394 on Symfony's side, because proxy-manager v1 is not maintained anymore, but is the only one that works on PHP 5.3/5.5, which we still support. Cannot be tested easily (but code is run by the existing test suite.) Commits ------- af9d644 [Bridge/ProxyManager] Remove direct reference to value holder property
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -93,7 +93,11 @@ function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy)
      */
     public function getProxyCode(Definition $definition)
     {
-        return $this->classGenerator->generate($this->generateProxyClass($definition));
+        return preg_replace(
+            '/(\$this->initializer[0-9a-f]++) && \1->__invoke\(\$this->(valueHolder[0-9a-f]++), (.*?), \1\);/',
+            '$1 && ($1->__invoke(\$$2, $3, $1) || 1) && $this->$2 = \$$2;',
+            $this->classGenerator->generate($this->generateProxyClass($definition))
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,11 @@ function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy)`
`93`	`93`	`*/`
`94`	`94`	`public function getProxyCode(Definition $definition)`
`95`	`95`	`{`
`96`		`- return $this->classGenerator->generate($this->generateProxyClass($definition));`
	`96`	`+ return preg_replace(`
	`97`	`+ '/(\$this->initializer[0-9a-f]++) && \1->__invoke\(\$this->(valueHolder[0-9a-f]++), (.*?), \1\);/',`
	`98`	`+ '$1 && ($1->__invoke(\$$2, $3, $1) \|\| 1) && $this->$2 = \$$2;',`
	`99`	`+ $this->classGenerator->generate($this->generateProxyClass($definition))`
	`100`	`+ );`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`/**`