Repair vetting type hints

OpenConext · Apr 17, 2024 · f48e25b · f48e25b
1 parent 4fd7771
commit f48e25b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -19,6 +19,15 @@ services:
     resource: '../src/Surfnet/StepupRa/RaBundle/Controller/*'
     tags: [ 'controller.service_arguments' ]
 
+  Surfnet\StepupRa\RaBundle\Controller\VettingTypeHintController:
+    arguments:
+      - '@logger'
+      - '@ra.service.institution_listing'
+      - '@ra.service.profile'
+      - '@Surfnet\StepupRa\RaBundle\Service\VettingTypeHintService'
+      - '%locales%'
+    tags: ['controller.service_arguments']
+
   logger:
     alias: 'monolog.logger'
     public: true

diff --git a/src/Surfnet/StepupRa/RaBundle/Command/SearchRecoveryTokensCommand.php b/src/Surfnet/StepupRa/RaBundle/Command/SearchRecoveryTokensCommand.php
@@ -29,7 +29,7 @@ final class SearchRecoveryTokensCommand
 
     public ?string $type = null;
 
-    public string $status = '';
+    public ?string $status = '';
 
     public ?string $email = null;
 

diff --git a/src/Surfnet/StepupRa/RaBundle/Command/VettingTypeHintCommand.php b/src/Surfnet/StepupRa/RaBundle/Command/VettingTypeHintCommand.php
@@ -37,25 +37,19 @@
 class VettingTypeHintCommand
 {
 
-    /**
-     * @var string
-     */
-    public $identityId;
+    public string $identityId;
 
-    /**
-     * @var string
-     */
-    public $institution;
+    public string $institution;
 
     /**
      * @var string[]
      */
-    public $locales;
+    public array $locales;
 
     /**
      * @var string[]
      */
-    public $hints = [];
+    public array $hints = [];
 
     /**
      * The translatable hints are set, using the PHP magic setter

diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupRa/RaBundle/Controller/VettingTypeHintController.php
@@ -42,7 +42,7 @@ public function __construct(
         private readonly InstitutionListingService $institutionListingService,
         private readonly ProfileService            $profileService,
         private readonly VettingTypeHintService    $vettingTypeHintService,
-        private readonly array $locales,
+        private readonly array $locales = [],
     ) {
     }
 

diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/config/services.yml b/src/Surfnet/StepupRa/RaBundle/Resources/config/services.yml
@@ -316,7 +316,6 @@ services:
         arguments:
             - '@Surfnet\StepupRa\RaBundle\Service\RecoveryTokenService'
             - '@Knp\Component\Pager\PaginatorInterface'
-            - '@security.token_storage'
             - "@logger"
         tags: ['controller.service_arguments']