Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 8ad1c1bad0a5 · 2019-12-16T15:48:47.000+01:00
* 4.4:
  Fix displaying anonymous classes on PHP 7.4
  Fix merge
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -73,7 +73,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
                 }
             }
 
-            if ($args !== $frame['args']) {
+            if (__FILE__ !== $frame['file']) {
                 throw $e;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- if ($args !== $frame['args']) {`
	`76`	`+ if (__FILE__ !== $frame['file']) {`
`77`	`77`	`throw $e;`
`78`	`78`	`}`
`79`	`79`	`}`