4565: Fixed merge

tuj · tuj · commit cb17e477e0cb · 2025-09-08T14:24:21.000+02:00
diff --git a/src/Command/Utils/ConvertConfigJsonToEnvCommand.php b/src/Command/Utils/ConvertConfigJsonToEnvCommand.php
@@ -14,14 +14,12 @@
 
 #[AsCommand(
     name: 'app:utils:convert-config-json-to-env',
-    description: 'Converts a config json (admin/client) from 2.x to .env variables used in 3.x',
     description: 'Converts a config json file (admin/client) from 2.x to .env variables used in 3.x',
 )]
 class ConvertConfigJsonToEnvCommand extends Command
 {
     protected function configure(): void
     {
-        $this->addArgument('filepath', InputArgument::REQUIRED, 'Path to the file to convert');
         $this->addArgument('filepath', InputArgument::REQUIRED, 'Path to the file or URL to convert');
         $this->addOption('type', 't', InputOption::VALUE_REQUIRED, 'Type of the config (admin or client).', null, ['admin', 'client']);
     }

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,12 @@`
`14`	`14`
`15`	`15`	`#[AsCommand(`
`16`	`16`	`name: 'app:utils:convert-config-json-to-env',`
`17`		`- description: 'Converts a config json (admin/client) from 2.x to .env variables used in 3.x',`
`18`	`17`	`description: 'Converts a config json file (admin/client) from 2.x to .env variables used in 3.x',`
`19`	`18`	`)]`
`20`	`19`	`class ConvertConfigJsonToEnvCommand extends Command`
`21`	`20`	`{`
`22`	`21`	`protected function configure(): void`
`23`	`22`	`{`
`24`		`- $this->addArgument('filepath', InputArgument::REQUIRED, 'Path to the file to convert');`
`25`	`23`	`$this->addArgument('filepath', InputArgument::REQUIRED, 'Path to the file or URL to convert');`
`26`	`24`	`$this->addOption('type', 't', InputOption::VALUE_REQUIRED, 'Type of the config (admin or client).', null, ['admin', 'client']);`
`27`	`25`	`}`