Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit 115de5a756d3 · 2020-02-05T10:24:01.000+01:00
* 5.0:
  Provide current file as file path
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -96,16 +96,13 @@ public static function collectDeprecations($outputFile)
                 return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
             }
 
-            $trace = debug_backtrace();
             $filesStack = [];
-            foreach ($trace as $line) {
-                if (\in_array($line['function'], ['require', 'require_once', 'include', 'include_once'], true)) {
+            foreach (debug_backtrace() as $frame) {
+                if (!isset($frame['file']) || \in_array($frame['function'], ['require', 'require_once', 'include', 'include_once'], true)) {
                     continue;
                 }
 
-                if (isset($line['file'])) {
-                    $filesStack[] = $line['file'];
-                }
+                $filesStack[] = $frame['file'];
             }
 
             $deprecations[] = [error_reporting(), $msg, $file, $filesStack];
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -165,24 +165,6 @@ public function isMuted()
         return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
     }
 
-    private function getOriginalFilesStack(): array
-    {
-        if (null === $this->originalFilesStack) {
-            $this->originalFilesStack = [];
-            foreach ($this->trace as $line) {
-                if (\in_array($line['function'], ['require', 'require_once', 'include', 'include_once'], true)) {
-                    continue;
-                }
-                if (!isset($line['file'])) {
-                    continue;
-                }
-                $this->originalFilesStack[] = $line['file'];
-            }
-        }
-
-        return $this->originalFilesStack;
-    }
-
     /**
      * Tells whether both the calling package and the called package are vendor
      * packages.
@@ -224,6 +206,22 @@ public function getType()
         return self::TYPE_DIRECT;
     }
 
+    private function getOriginalFilesStack(): array
+    {
+        if (null === $this->originalFilesStack) {
+            $this->originalFilesStack = [];
+            foreach ($this->trace as $frame) {
+                if (!isset($frame['file']) || \in_array($frame['function'], ['require', 'require_once', 'include', 'include_once'], true)) {
+                    continue;
+                }
+
+                $this->originalFilesStack[] = $frame['file'];
+            }
+        }
+
+        return $this->originalFilesStack;
+    }
+
     /**
      * getPathType() should always be called prior to calling this method.
      *
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -157,7 +157,7 @@ public function providerGetTypeDetectsSelf(): array
         }
 
         return [
-            'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', ''],
+            'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', __FILE__],
             'nonexistent_file' => [Deprecation::TYPE_UNDETERMINED, '', 'MyClass1', 'dummy_vendor_path'],
             'serialized_trace_with_nonexistent_triggering_file' => [
                 Deprecation::TYPE_UNDETERMINED,

Original file line number	Diff line number	Diff line change
`@@ -96,16 +96,13 @@ public static function collectDeprecations($outputFile)`
`96`	`96`	`return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);`
`97`	`97`	`}`
`98`	`98`
`99`		`- $trace = debug_backtrace();`
`100`	`99`	`$filesStack = [];`
`101`		`- foreach ($trace as $line) {`
`102`		`- if (\in_array($line['function'], ['require', 'require_once', 'include', 'include_once'], true)) {`
	`100`	`+ foreach (debug_backtrace() as $frame) {`
	`101`	`+ if (!isset($frame['file']) \|\| \in_array($frame['function'], ['require', 'require_once', 'include', 'include_once'], true)) {`
`103`	`102`	`continue;`
`104`	`103`	`}`
`105`	`104`
`106`		`- if (isset($line['file'])) {`
`107`		`- $filesStack[] = $line['file'];`
`108`		`- }`
	`105`	`+ $filesStack[] = $frame['file'];`
`109`	`106`	`}`
`110`	`107`
`111`	`108`	`$deprecations[] = [error_reporting(), $msg, $file, $filesStack];`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function providerGetTypeDetectsSelf(): array`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`return [`
`160`		`- 'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', ''],`
	`160`	`+ 'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', __FILE__],`
`161`	`161`	`'nonexistent_file' => [Deprecation::TYPE_UNDETERMINED, '', 'MyClass1', 'dummy_vendor_path'],`
`162`	`162`	`'serialized_trace_with_nonexistent_triggering_file' => [`
`163`	`163`	`Deprecation::TYPE_UNDETERMINED,`