Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit e71b9167d128 · 2021-03-17T18:02:05.000+01:00
* 4.4:
  CS fix
diff --git a/DeprecationErrorHandler/Deprecation.php b/DeprecationErrorHandler/Deprecation.php
@@ -121,11 +121,11 @@ public function __construct($message, array $trace, $file)
             return;
         }
 
-        $test = $line['args'][0] ?? null;
+        $test = isset($line['args'][0]) ? $line['args'][0] : null;
 
         if (($test instanceof TestCase || $test instanceof TestSuite) && ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class']))) {
-            $this->originClass = \get_class($line['args'][0]);
-            $this->originMethod = $line['args'][0]->getName();
+            $this->originClass = \get_class($test);
+            $this->originMethod = $test->getName();
 
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,11 @@ public function __construct($message, array $trace, $file)`
`121`	`121`	`return;`
`122`	`122`	`}`
`123`	`123`
`124`		`- $test = $line['args'][0] ?? null;`
	`124`	`+ $test = isset($line['args'][0]) ? $line['args'][0] : null;`
`125`	`125`
`126`	`126`	`if (($test instanceof TestCase \|\| $test instanceof TestSuite) && ('trigger_error' !== $trace[$i - 2]['function'] \|\| isset($trace[$i - 2]['class']))) {`
`127`		`- $this->originClass = \get_class($line['args'][0]);`
`128`		`- $this->originMethod = $line['args'][0]->getName();`
	`127`	`+ $this->originClass = \get_class($test);`
	`128`	`+ $this->originMethod = $test->getName();`
`129`	`129`
`130`	`130`	`return;`
`131`	`131`	`}`