bug symfony#52427 [Console][Process] do not let context classes extend the message classes (xabbuh)

nicolas-grekas · nicolas-grekas · commit 8b1330186883 · 2023-11-02T14:38:17.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Console][Process] do not let context classes extend the message classes | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- d96479d do not let context classes extend the message classes
diff --git a/src/Symfony/Component/Console/Messenger/RunCommandContext.php b/src/Symfony/Component/Console/Messenger/RunCommandContext.php
@@ -14,10 +14,12 @@
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  */
-final class RunCommandContext extends RunCommandMessage
+final class RunCommandContext
 {
-    public function __construct(RunCommandMessage $message, public readonly int $exitCode, public readonly string $output)
-    {
-        parent::__construct($message->input, $message->throwOnFailure, $message->catchExceptions);
+    public function __construct(
+        public readonly RunCommandMessage $message,
+        public readonly int $exitCode,
+        public readonly string $output,
+    ) {
     }
 }
diff --git a/src/Symfony/Component/Process/Messenger/RunProcessContext.php b/src/Symfony/Component/Process/Messenger/RunProcessContext.php
@@ -16,16 +16,16 @@
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  */
-final class RunProcessContext extends RunProcessMessage
+final class RunProcessContext
 {
     public readonly ?int $exitCode;
     public readonly ?string $output;
     public readonly ?string $errorOutput;
 
-    public function __construct(RunProcessMessage $message, Process $process)
-    {
-        parent::__construct($message->command, $message->cwd, $message->env, $message->input, $message->timeout);
-
+    public function __construct(
+        public readonly RunProcessMessage $message,
+        Process $process,
+    ) {
         $this->exitCode = $process->getExitCode();
         $this->output = $process->isOutputDisabled() ? null : $process->getOutput();
         $this->errorOutput = $process->isOutputDisabled() ? null : $process->getErrorOutput();
diff --git a/src/Symfony/Component/Process/Tests/Messenger/RunProcessMessageHandlerTest.php b/src/Symfony/Component/Process/Tests/Messenger/RunProcessMessageHandlerTest.php
@@ -22,7 +22,7 @@ public function testRunSuccessfulProcess()
     {
         $context = (new RunProcessMessageHandler())(new RunProcessMessage(['ls'], cwd: __DIR__));
 
-        $this->assertSame(['ls'], $context->command);
+        $this->assertSame(['ls'], $context->message->command);
         $this->assertSame(0, $context->exitCode);
         $this->assertStringContainsString(basename(__FILE__), $context->output);
     }
@@ -32,7 +32,7 @@ public function testRunFailedProcess()
         try {
             (new RunProcessMessageHandler())(new RunProcessMessage(['invalid']));
         } catch (RunProcessFailedException $e) {
-            $this->assertSame(['invalid'], $e->context->command);
+            $this->assertSame(['invalid'], $e->context->message->command);
             $this->assertSame('\\' === \DIRECTORY_SEPARATOR ? 1 : 127, $e->context->exitCode);
 
             return;

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,12 @@`
`14`	`14`	`/**`
`15`	`15`	`* @author Kevin Bond <kevinbond@gmail.com>`
`16`	`16`	`*/`
`17`		`-final class RunCommandContext extends RunCommandMessage`
	`17`	`+final class RunCommandContext`
`18`	`18`	`{`
`19`		`- public function __construct(RunCommandMessage $message, public readonly int $exitCode, public readonly string $output)`
`20`		`- {`
`21`		`- parent::__construct($message->input, $message->throwOnFailure, $message->catchExceptions);`
	`19`	`+ public function __construct(`
	`20`	`+ public readonly RunCommandMessage $message,`
	`21`	`+ public readonly int $exitCode,`
	`22`	`+ public readonly string $output,`
	`23`	`+ ) {`
`22`	`24`	`}`
`23`	`25`	`}`