minor #45927 [VarExporter] Fix syntax that makes psalm crash (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 275448e4357c · 2022-04-03T12:34:59.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [VarExporter] Fix syntax that makes psalm crash | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Should make running psalm possible again. /cc `@orklah` FYI, running this code (before the change proposed her) with dev-master crashes: `plasm --set-baseline=.github/psalm/psalm.baseline.xml --no-progress src/Symfony/Component/VarExporter/` Commits ------- 1f592ae [VarExporter] Fix syntax that makes psalm crash
diff --git a/src/Symfony/Component/VarExporter/Internal/Registry.php b/src/Symfony/Component/VarExporter/Internal/Registry.php
@@ -59,8 +59,9 @@ public static function p($class)
     public static function f($class)
     {
         $reflector = self::$reflectors[$class] ?? self::getClassReflector($class, true, false);
+        self::$factories[$class] = $reflector->newInstanceWithoutConstructor(...);
 
-        return self::$factories[$class] = $reflector->newInstanceWithoutConstructor(...);
+        return self::$factories[$class];
     }
 
     public static function getClassReflector($class, $instantiableWithoutConstructor = false, $cloneable = null)

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@ public static function p($class)`
`59`	`59`	`public static function f($class)`
`60`	`60`	`{`
`61`	`61`	`$reflector = self::$reflectors[$class] ?? self::getClassReflector($class, true, false);`
	`62`	`+ self::$factories[$class] = $reflector->newInstanceWithoutConstructor(...);`
`62`	`63`
`63`		`- return self::$factories[$class] = $reflector->newInstanceWithoutConstructor(...);`
	`64`	`+ return self::$factories[$class];`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`public static function getClassReflector($class, $instantiableWithoutConstructor = false, $cloneable = null)`