minor #33180 [ProxyManager] fix closure binding (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 1e47f0fe47c5 · 2019-08-15T10:47:41.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [ProxyManager] fix closure binding | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #33037 | License | MIT | Doc PR | - Follows #32992 Commits ------- 31f9208 [ProxyManager] fix closure binding
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -113,7 +113,7 @@ public function getProxyCode(Definition $definition)
         }
 
         if (version_compare(self::getProxyManagerVersion(), '2.5', '<')) {
-            $code = str_replace(' \Closure::bind(function ', ' \Closure::bind(static function ', $code);
+            $code = preg_replace('/ \\\\Closure::bind\(function ((?:& )?\(\$instance(?:, \$value)?\))/', ' \Closure::bind(static function \1', $code);
         }
 
         return $code;

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function getProxyCode(Definition $definition)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if (version_compare(self::getProxyManagerVersion(), '2.5', '<')) {`
`116`		`- $code = str_replace(' \Closure::bind(function ', ' \Closure::bind(static function ', $code);`
	`116`	`+ $code = preg_replace('/ \\\\Closure::bind\(function ((?:& )?\(\$instance(?:, \$value)?\))/', ' \Closure::bind(static function \1', $code);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`return $code;`