bug #41751 [Messenger] prevent reflection usages when classes do not exist (xabbuh)

xabbuh · xabbuh · commit 53c06ea54693 · 2021-06-21T08:56:53.000+02:00
This PR was merged into the 5.2 branch. Discussion ---------- [Messenger] prevent reflection usages when classes do not exist | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41748 | License | MIT | Doc PR | Commits ------- 017b4b3 prevent reflection usages when classes do not exist
diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
@@ -127,6 +127,6 @@ private function resolveAlias(string $fqcn): string
     {
         static $resolved;
 
-        return $resolved[$fqcn] ?? ($resolved[$fqcn] = (new \ReflectionClass($fqcn))->getName());
+        return $resolved[$fqcn] ?? ($resolved[$fqcn] = class_exists($fqcn) ? (new \ReflectionClass($fqcn))->getName() : $fqcn);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
@@ -55,6 +55,13 @@ public function testWithoutAll()
         $this->assertCount(1, $envelope->all(DelayStamp::class));
     }
 
+    public function testWithoutAllWithNonExistentStampClass()
+    {
+        $envelope = new Envelope(new DummyMessage('dummy'));
+
+        $this->assertInstanceOf(Envelope::class, $envelope->withoutAll(NonExistentStamp::class));
+    }
+
     public function testWithoutStampsOfType()
     {
         $envelope = new Envelope(new DummyMessage('dummy'), [
@@ -77,6 +84,13 @@ public function testWithoutStampsOfType()
         $this->assertEmpty($envelope5->all());
     }
 
+    public function testWithoutStampsOfTypeWithNonExistentStampClass()
+    {
+        $envelope = new Envelope(new DummyMessage('dummy'));
+
+        $this->assertInstanceOf(Envelope::class, $envelope->withoutStampsOfType(NonExistentStamp::class));
+    }
+
     public function testLast()
     {
         $receivedStamp = new ReceivedStamp('transport');
@@ -86,6 +100,13 @@ public function testLast()
         $this->assertNull($envelope->last(ValidationStamp::class));
     }
 
+    public function testLastWithNonExistentStampClass()
+    {
+        $envelope = new Envelope(new DummyMessage('dummy'));
+
+        $this->assertNull($envelope->last(NonExistentStamp::class));
+    }
+
     public function testAll()
     {
         $envelope = (new Envelope($dummy = new DummyMessage('dummy')))
@@ -100,6 +121,13 @@ public function testAll()
         $this->assertSame($validationStamp, $stamps[ValidationStamp::class][0]);
     }
 
+    public function testAllWithNonExistentStampClass()
+    {
+        $envelope = new Envelope(new DummyMessage('dummy'));
+
+        $this->assertSame([], $envelope->all(NonExistentStamp::class));
+    }
+
     public function testWrapWithMessage()
     {
         $message = new \stdClass();

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,6 @@ private function resolveAlias(string $fqcn): string`
`127`	`127`	`{`
`128`	`128`	`static $resolved;`
`129`	`129`
`130`		`- return $resolved[$fqcn] ?? ($resolved[$fqcn] = (new \ReflectionClass($fqcn))->getName());`
	`130`	`+ return $resolved[$fqcn] ?? ($resolved[$fqcn] = class_exists($fqcn) ? (new \ReflectionClass($fqcn))->getName() : $fqcn);`
`131`	`131`	`}`
`132`	`132`	`}`