8000 [Bridge/ProxyManager] Remove direct reference to value holder property by nicolas-grekas · Pull Request #24906 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Bridge/ProxyManager] Remove direct reference to value holder property #24906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2017
Merged

[Bridge/ProxyManager] Remove direct reference to value holder property #24906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Bridge/ProxyManager] Remove direct reference to value holder property
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Nov 10, 2017
commit af9d6446eadde32587ec02f2ff04207b713431d0
6 changes: 5 additions & 1 deletion src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
);
}

/**
Expand Down
0