bug symfony#25981 [DI] Fix tracking of source class changes for lazy-proxies (nicolas-grekas)

fabpot · fabpot · commit 6cfcfae00973 · 2018-02-01T05:50:52.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] Fix tracking of source class changes for lazy-proxies | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 4f18e4b [DI] Fix tracking of source class changes for lazy-proxies
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -398,6 +398,8 @@ private function generateProxyClasses()
             if (!$proxyDumper->isProxyCandidate($definition)) {
                 continue;
             }
+            // register class' reflector for resource tracking
+            $this->container->getReflectionClass($definition->getClass());
             $proxyCode = "\n".$proxyDumper->getProxyCode($definition);
             if ($strip) {
                 $proxyCode = "<?php\n".$proxyCode;
@@ -1043,10 +1045,10 @@ protected function load(\$file, \$lazyLoad = true)
             }
             $code .= <<<EOF
 
-protected function createProxy(\$class, \Closure \$factory)
-{
-    {$proxyLoader}return \$factory();
-}
+    protected function createProxy(\$class, \Closure \$factory)
+    {
+        {$proxyLoader}return \$factory();
+    }
 
 EOF;
             break;
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -842,7 +842,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
         $dumper = new PhpDumper($container);
 
         if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper')) {
-            $dumper->setProxyDumper(new ProxyDumper(substr(hash('sha256', $cache->getPath()), 0, 7)));
+            $dumper->setProxyDumper(new ProxyDumper());
         }
 
         $content = $dumper->dump(array(

Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`842`	`842`	`$dumper = new PhpDumper($container);`
`843`	`843`
`844`	`844`	`if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper')) {`
`845`		`- $dumper->setProxyDumper(new ProxyDumper(substr(hash('sha256', $cache->getPath()), 0, 7)));`
	`845`	`+ $dumper->setProxyDumper(new ProxyDumper());`
`846`	`846`	`}`
`847`	`847`
`848`	`848`	`$content = $dumper->dump(array(`