[ProxyManager] fix tests

nicolas-grekas · nicolas-grekas · commit c5904be45dcd · 2018-09-02T06:58:46.000+02:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php
@@ -41,6 +41,8 @@ public function generate(\ReflectionClass $originalClass, ClassGenerator $classG
                 $method->getBody()
             );
             $body = str_replace('(new \ReflectionClass(get_class()))', '$reflection', $body);
+            $body = str_replace('$reflection = $reflection ?: ', '$reflection = $reflection ?? ', $body);
+            $body = str_replace('$reflection ?? $reflection = ', '$reflection ?? ', $body);
 
             if ($originalClass->isInterface()) {
                 $body = str_replace('get_parent_class($this)', var_export($originalClass->name, true), $body);
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php
@@ -48,7 +48,7 @@ public static function staticProxyConstructor($initializer)
     {
         static $reflection;
 
-        $reflection = $reflection ?? $reflection = new \ReflectionClass(__CLASS__);
+        $reflection = $reflection ?? new \ReflectionClass(__CLASS__);
         $instance = $reflection->newInstanceWithoutConstructor();
 
         $instance->initializer1eff735 = $initializer;
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -156,7 +156,6 @@ protected function createProxy(\$class, \Closure \$factory)
         $implem = preg_replace('#\n    /\*\*.*?\*/#s', '', $implem);
         $implem = str_replace('getWrappedValueHolderValue() : ?object', 'getWrappedValueHolderValue()', $implem);
         $implem = str_replace("array(\n        \n    );", "[\n        \n    ];", $implem);
-        $implem = str_replace('$reflection ?: $reflection', '$reflection ?? $reflection', $implem);
         $this->assertStringEqualsFile(__DIR__.'/Fixtures/proxy-implem.php', $implem);
         $this->assertStringEqualsFile(__DIR__.'/Fixtures/proxy-factory.php', $factory);
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static function staticProxyConstructor($initializer)`
`48`	`48`	`{`
`49`	`49`	`static $reflection;`
`50`	`50`
`51`		`- $reflection = $reflection ?? $reflection = new \ReflectionClass(__CLASS__);`
	`51`	`+ $reflection = $reflection ?? new \ReflectionClass(__CLASS__);`
`52`	`52`	`$instance = $reflection->newInstanceWithoutConstructor();`
`53`	`53`
`54`	`54`	`$instance->initializer1eff735 = $initializer;`