[PhpUnitBridge] Fix error when setting "self" property value

l-vo · l-vo · commit e9cf4dfda8fb · 2019-06-01T20:28:37.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -70,8 +70,8 @@ public function __construct($message, array $trace, $file)
                 // \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
                 // then we need to use the serialized information to determine
                 // if the error has been triggered from vendor code.
-                $this->self = isset($parsedMsg['triggering_file'])
-                    && $this->pathOriginatesFromVendor($parsedMsg['triggering_file']);
+                $this->self = !isset($parsedMsg['triggering_file'])
+                    || !$this->pathOriginatesFromVendor($parsedMsg['triggering_file']);
 
                 return;
             }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;
+use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV5;
 
 class DeprecationTest extends TestCase
 {
@@ -56,9 +57,60 @@ public function testItRulesOutFilesOutsideVendorsAsIndirect()
         $this->assertFalse($deprecation->isIndirect());
     }
 
+    public function providerIsSelf(): array
+    {
+        return [
+            'not_from_vendors_file' => [true, '', 'MyClass1', ''],
+            'nonexistent_file' => [false, '', 'MyClass1', 'dummy_vendor_path'],
+            'serialized_trace_without_triggering_file' => [
+                true,
+                serialize(['class' => '', 'method' => '', 'deprecation' => '', 'files_stack' => []]),
+                SymfonyTestsListenerForV5::class,
+                '',
+            ],
+            'serialized_trace_with_not_from_vendors_triggering_file' => [
+                true,
+                serialize([
+                    'class' => '',
+                    'method' => '',
+                    'deprecation' => '',
+                    'triggering_file' => '',
+                    'files_stack' => [],
+                ]),
+                SymfonyTestsListenerForV5::class,
+                '',
+            ],
+            'serialized_trace_with_nonexistent_triggering_file' => [
+                false,
+                serialize([
+                    'class' => '',
+                    'method' => '',
+                    'deprecation' => '',
+                    'triggering_file' => 'dummy_vendor_path',
+                    'files_stack' => [],
+                ]),
+                SymfonyTestsListenerForV5::class,
+                '',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider providerIsSelf
+     */
+    public function testIsSelf(bool $expectedIsSelf, string $message, string $traceClass, string $file): void
+    {
+        $trace = [
+            ['class' => 'MyClass1', 'function' => 'myMethod'],
+            ['class' => $traceClass, 'function' => 'myMethod'],
+        ];
+        $deprecation = new Deprecation($message, $trace, $file);
+        $this->assertEquals($expectedIsSelf, $deprecation->isSelf());
+    }
+
     /**
      * This method is here to simulate the extra level from the piece of code
-     * triggering an error to the error handler
+     * triggering an error to the error handler.
      */
     public function debugBacktrace(): array
     {
