Resolve conflicts

Author: Spomky

src/Component/Console/AddKeyIntoKeysetCommand.php

@@ -10,18 +10,18 @@
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\JWKSet;
 use Jose\Component\Core\Util\JsonConverter;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'keyset:add:key', description: 'Add a key into a key set.')]
 final class AddKeyIntoKeysetCommand extends ObjectOutputCommand
 {
-    protected static $defaultName = 'keyset:add:key';
-
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('Add a key into a key set.')
+        $this
             ->setHelp('This command adds a key at the end of a key set.')
             ->addArgument('jwkset', InputArgument::REQUIRED, 'The JWKSet object')
             ->addArgument('jwk', InputArgument::REQUIRED, 'The new JWK object');

src/Component/Console/EcKeyGeneratorCommand.php

@@ -7,19 +7,20 @@
 use InvalidArgumentException;
 use function is_string;
 use Jose\Component\KeyManagement\JWKFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'key:generate:ec', description: 'Generate an EC key (JWK format)')]
 final class EcKeyGeneratorCommand extends GeneratorCommand
 {
-    protected static $defaultName = 'key:generate:ec';
-
     protected function configure(): void
     {
         parent::configure();
         $this->setDescription('Generate an EC key (JWK format)')
-            ->addArgument('curve', InputArgument::REQUIRED, 'Curve of the key.');
+            ->addArgument('curve', InputArgument::REQUIRED, 'Curve of the key.')
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int

src/Component/Console/EcKeysetGeneratorCommand.php

@@ -8,18 +8,18 @@
 use function is_string;
 use Jose\Component\Core\JWKSet;
 use Jose\Component\KeyManagement\JWKFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'keyset:generate:ec', description: 'Generate an EC key set (JWKSet format)')]
 final class EcKeysetGeneratorCommand extends GeneratorCommand
 {
-    protected static $defaultName = 'keyset:generate:ec';
-
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('Generate an EC key set (JWKSet format)')
+        $this
             ->addArgument('quantity', InputArgument::REQUIRED, 'Quantity of keys in the key set.')
             ->addArgument('curve', InputArgument::REQUIRED, 'Curve of the keys.');
     }

src/Component/Console/GetThumbprintCommand.php

@@ -9,19 +9,19 @@
 use function is_string;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\JsonConverter;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'key:thumbprint', description: 'Get the thumbprint of a JWK key.')]
 final class GetThumbprintCommand extends ObjectOutputCommand
 {
-    protected static $defaultName = 'key:thumbprint';
-
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('Get the thumbprint of a JWK key.')
+        $this
             ->addArgument('jwk', InputArgument::REQUIRED, 'The JWK key.')
             ->addOption('hash', null, InputOption::VALUE_OPTIONAL, 'The hashing algorithm.', 'sha256');
     }

src/Component/Console/JKULoaderCommand.php

@@ -7,27 +7,27 @@
 use InvalidArgumentException;
 use function is_string;
 use Jose\Component\KeyManagement\JKUFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'keyset:load:jku', description: 'Loads a key set from an url.')]
 final class JKULoaderCommand extends ObjectOutputCommand
 {
-    protected static $defaultName = 'keyset:load:jku';
-
     public function __construct(
         private readonly JKUFactory $jkuFactory,
-        ?string $name = null
     ) {
-        parent::__construct($name);
+        parent::__construct();
     }
 
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('Loads a key set from an url.')
+        $this
             ->setHelp('This command will try to get a key set from an URL. The distant key set is a JWKSet.')
-            ->addArgument('url', InputArgument::REQUIRED, 'The URL');
+            ->addArgument('url', InputArgument::REQUIRED, 'The URL')
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int

src/Component/Console/KeyAnalyzerCommand.php

@@ -10,27 +10,26 @@
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\KeyManagement\Analyzer\KeyAnalyzerManager;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'key:analyze', description: 'JWK quality analyzer.')]
 final class KeyAnalyzerCommand extends Command
 {
-    protected static $defaultName = 'key:analyze';
-
     public function __construct(
         private readonly KeyAnalyzerManager $analyzerManager,
-        string $name = null
     ) {
-        parent::__construct($name);
+        parent::__construct();
     }
 
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('JWK quality analyzer.')
+        $this
             ->setHelp('This command will analyze a JWK object and find security issues.')
             ->addArgument('jwk', InputArgument::REQUIRED, 'The JWK object');
     }

src/Component/Console/KeyFileLoaderCommand.php

@@ -7,19 +7,19 @@
 use InvalidArgumentException;
 use function is_string;
 use Jose\Component\KeyManagement\JWKFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'key:load:key', description: 'Loads a key from a key file (JWK format)')]
 final class KeyFileLoaderCommand extends GeneratorCommand
 {
-    protected static $defaultName = 'key:load:key';
-
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('Loads a key from a key file (JWK format)')
+        $this
             ->addArgument('file', InputArgument::REQUIRED, 'Filename of the key.')
             ->addOption('secret', 's', InputOption::VALUE_OPTIONAL, 'Secret if the key is encrypted.', null);
     }

src/Component/Console/KeysetAnalyzerCommand.php

@@ -12,28 +12,27 @@
 use Jose\Component\KeyManagement\Analyzer\KeyAnalyzerManager;
 use Jose\Component\KeyManagement\Analyzer\KeysetAnalyzerManager;
 use Jose\Component\KeyManagement\Analyzer\MessageBag;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'keyset:analyze', description: 'JWKSet quality analyzer.')]
 final class KeysetAnalyzerCommand extends Command
 {
-    protected static $defaultName = 'keyset:analyze';
-
     public function __construct(
         private readonly KeysetAnalyzerManager $keysetAnalyzerManager,
-        private readonly KeyAnalyzerManager $keyAnalyzerManager,
-        string $name = null
+        private readonly KeyAnalyzerManager $keyAnalyzerManager
     ) {
-        parent::__construct($name);
+        parent::__construct();
     }
 
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('JWKSet quality analyzer.')
+        $this
             ->setHelp('This command will analyze a JWKSet object and find security issues.')
             ->addArgument('jwkset', InputArgument::REQUIRED, 'The JWKSet object');
     }

src/Component/Console/MergeKeysetCommand.php

@@ -8,18 +8,18 @@
 use function is_array;
 use Jose\Component\Core\JWKSet;
 use Jose\Component\Core\Util\JsonConverter;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'keyset:merge', description: 'Merge several key sets into one.')]
 final class MergeKeysetCommand extends ObjectOutputCommand
 {
-    protected static $defaultName = 'keyset:merge';
-
     protected function configure(): void
     {
         parent::configure();
-        $this->setDescription('Merge several key sets into one.')
+        $this
             ->setHelp(
                 'This command merges several key sets into one. It is very useful when you generate e.g. RSA, EC and OKP keys and you want only one key set to rule them all.'
             )

src/Component/Console/NoneKeyGeneratorCommand.php

@@ -5,21 +5,16 @@
 namespace Jose\Component\Console;
 
 use Jose\Component\KeyManagement\JWKFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(
+    name: 'key:generate:none',
+    description: 'Generate a none key (JWK format). This key type is only supposed to be used with the "none" algorithm.',
+)]
 final class NoneKeyGeneratorCommand extends GeneratorCommand
 {
-    protected static $defaultName = 'key:generate:none';
-
-    protected function configure(): void
-    {
-        parent::configure();
-        $this->setDescription(
-            'Generate a none key (JWK format). This key type is only supposed to be used with the "none" algorithm.'
-        );
-    }
-
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $args = $this->getOptions($input);