Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 0f95953d1b36 · 2022-05-06T10:44:16.000+02:00
* 4.4:
  [Workflow] Fix deprecated syntax for interpolated strings
diff --git a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
@@ -53,7 +53,7 @@ protected function configure()
 
 Dump the script to a global completion file and restart your shell:
 
-    <info>%command.full_name% bash | sudo tee /etc/bash_completion.d/${commandName}</>
+    <info>%command.full_name% bash | sudo tee /etc/bash_completion.d/{$commandName}</>
 
 Or dump the script to a local file and source it:
 
@@ -70,7 +70,7 @@ protected function configure()
 
 Add this to the end of your shell configuration file (e.g. <info>"~/.bashrc"</>):
 
-    <info>eval "$(${fullCommand} completion bash)"</>
+    <info>eval "$({$fullCommand} completion bash)"</>
 EOH
             )
             ->addArgument('shell', InputArgument::OPTIONAL, 'The shell type (e.g. "bash"), the value of the "$SHELL" env var will be used if this is not given')
diff --git a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php
@@ -103,16 +103,16 @@ public function dump(Definition $definition, Marking $marking = null, array $opt
                         }
 
                         $lines = [
-                            "$fromEscaped -${transitionColor}-> ${transitionEscaped}${transitionLabel}",
-                            "$transitionEscaped -${transitionColor}-> ${toEscaped}${transitionLabel}",
+                            "{$fromEscaped} -{$transitionColor}-> {$transitionEscaped}{$transitionLabel}",
+                            "{$transitionEscaped} -{$transitionColor}-> {$toEscaped}{$transitionLabel}",
                         ];
                         foreach ($lines as $line) {
                             if (!\in_array($line, $code)) {
                                 $code[] = $line;
                             }
                         }
                     } else {
-                        $code[] = "$fromEscaped -${transitionColor}-> $toEscaped: $transitionEscapedWithStyle";
+                        $code[] = "{$fromEscaped} -{$transitionColor}-> {$toEscaped}: {$transitionEscapedWithStyle}";
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -103,16 +103,16 @@ public function dump(Definition $definition, Marking $marking = null, array $opt`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`$lines = [`
`106`		`- "$fromEscaped -${transitionColor}-> ${transitionEscaped}${transitionLabel}",`
`107`		`- "$transitionEscaped -${transitionColor}-> ${toEscaped}${transitionLabel}",`
	`106`	`+ "{$fromEscaped} -{$transitionColor}-> {$transitionEscaped}{$transitionLabel}",`
	`107`	`+ "{$transitionEscaped} -{$transitionColor}-> {$toEscaped}{$transitionLabel}",`
`108`	`108`	`];`
`109`	`109`	`foreach ($lines as $line) {`
`110`	`110`	`if (!\in_array($line, $code)) {`
`111`	`111`	`$code[] = $line;`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`} else {`
`115`		`- $code[] = "$fromEscaped -${transitionColor}-> $toEscaped: $transitionEscapedWithStyle";`
	`115`	`+ $code[] = "{$fromEscaped} -{$transitionColor}-> {$toEscaped}: {$transitionEscapedWithStyle}";`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`