Fix tests and config

composer.json

@@ -15,6 +15,7 @@
         "php": "^8.2",
         "ext-dom": "*",
         "ext-openssl": "*",
+        "doctrine/annotations": "^2.0",
         "fortawesome/font-awesome": "~4.2.0",
         "guzzlehttp/guzzle": "^7",
         "incenteev/composer-parameter-handler": "~2.0",
@@ -29,6 +30,7 @@
         "symfony/expression-language": "^6.0",
         "symfony/flex": "^v2.4.3",
         "symfony/form": "^6.0",
+        "symfony/framework-bundle": "6.4.*",
         "symfony/http-foundation": "^6.0",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^6.0",

config/packages/framework.yaml

@@ -3,16 +3,22 @@ framework:
   translator:      { fallback: "%default_locale%" }
   secret:          "%secret%"
   form:            ~
+  handle_all_throwables: true
+  annotations:
+    enabled: false
   csrf_protection: ~
-  validation:      { enable_annotations: true }
+  validation:      { enable_attributes: true }
   default_locale:  "%default_locale%"
   trusted_hosts:   ~
   session:
     # handler_id set to null will use default session handler from php.ini
     handler_id:  ~
     name: sess_ra
+    cookie_samesite: lax
     cookie_httponly: true
     cookie_secure: true
   fragments:       false
   http_method_override: true
   error_controller: Surfnet\StepupRa\RaBundle\Controller\ExceptionController
+  php_errors:
+    log: true

config/packages/security.yaml

@@ -1,7 +1,7 @@
 security:
     providers:
-        middleware:
-            id: ra.service.identity
+        saml-provider:
+            id: Surfnet\StepupRa\RaBundle\Security\Authentication\Provider\SamlProvider
 
     firewalls:
         dev:
@@ -32,4 +32,5 @@ security:
 
     access_control:
         - { path: ^/saml, roles: PUBLIC_ACCESS, requires_channel: https }
+        - { path: ^/authentication, roles: PUBLIC_ACCESS, requires_channel: https }
         - { path: ^/, roles: ROLE_RA, requires_channel: https }

config/routes/dev/jms_translation.yaml

@@ -1,4 +1,4 @@
-JMSTranslationBundle_ui:
-  resource: "@JMSTranslationBundle/Controller/"
-  type:     annotation
-  prefix:   /_trans
+#JMSTranslationBundle_ui:
+#  resource: "@JMSTranslationBundle/Controller/"
+#  type:     attribute
+#  prefix:   /_trans

src/Surfnet/StepupRa/RaBundle/Command/AccreditCandidateCommand.php

@@ -27,14 +27,10 @@ class AccreditCandidateCommand
 
     public string $institution;
 
-    /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.location.may_not_be_blank")
-     */
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.location.may_not_be_blank')]
     public string $location;
 
-    /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.contact_information.may_not_be_blank")
-     */
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.contact_information.may_not_be_blank')]
     public string $contactInformation;
 
     public RoleAtInstitution $roleAtInstitution;

src/Surfnet/StepupRa/RaBundle/Command/AmendRegistrationAuthorityInformationCommand.php

@@ -24,14 +24,10 @@ class AmendRegistrationAuthorityInformationCommand
 {
     public string $identityId;
 
-    /**
-     * @Assert\NotBlank(message="ra.amend_ra_information.location")
-     */
+    #[Assert\NotBlank(message: 'ra.amend_ra_information.location')]
     public string $location;
 
-    /**
-     * @Assert\NotBlank(message="ra.amend_ra_information.contact_information")
-     */
+    #[Assert\NotBlank(message: 'ra.amend_ra_information.contact_information')]
     public string $contactInformation;
 
     public string $institution;

src/Surfnet/StepupRa/RaBundle/Command/ChangeRaLocationCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Copyright 2016 SURFnet bv
  *
@@ -22,42 +24,18 @@
 
 class ChangeRaLocationCommand
 {
-    /**
-     * @var string
-     */
-    public $id;
-
-    /**
-     * @var string
-     */
-    public $institution;
-
-    /**
-     * @var string
-     */
-    public $currentUserId;
-
-    /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.name.may_not_be_blank")
-     * @Assert\Type(type="string")
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.location.may_not_be_blank")
-     * @Assert\Type(type="string")
-     *
-     * @var string
-     */
-    public $location;
-
-    /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.contact_information.may_not_be_blank")
-     * @Assert\Type(type="string")
-     *
-     * @var string
-     */
-    public $contactInformation;
+    public string $id;
+
+    public string $institution;
+
+    public string $currentUserId;
+
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.name.may_not_be_blank')]
+    public string $name;
+
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.location.may_not_be_blank')]
+    public string $location;
+
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.contact_information.may_not_be_blank')]
+    public string $contactInformation;
 }

src/Surfnet/StepupRa/RaBundle/Command/CreateRaLocationCommand.php

@@ -38,26 +38,26 @@ class CreateRaLocationCommand
     public $currentUserId;
 
     /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.name.may_not_be_blank")
-     * @Assert\Type(type="string")
      *
      * @var string
      */
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.name.may_not_be_blank')]
+    #[Assert\Type(type: 'string')]
     public $name;
 
     /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.location.may_not_be_blank")
-     * @Assert\Type(type="string")
      *
      * @var string
      */
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.location.may_not_be_blank')]
+    #[Assert\Type(type: 'string')]
     public $location;
 
     /**
-     * @Assert\NotBlank(message="ra.accredit_candidate.contact_information.may_not_be_blank")
-     * @Assert\Type(type="string")
      *
      * @var string
      */
+    #[Assert\NotBlank(message: 'ra.accredit_candidate.contact_information.may_not_be_blank')]
+    #[Assert\Type(type: 'string')]
     public $contactInformation;
 }

src/Surfnet/StepupRa/RaBundle/Command/ExportRaSecondFactorsCommand.php

@@ -28,11 +28,11 @@ final class ExportRaSecondFactorsCommand
     public const STATUS_REVOKED = 'revoked';
 
     /**
-     * @Assert\NotBlank(message="ra.search_ra_second_factors.actor.blank")
-     * @Assert\Type("string", message="ra.search_ra_second_factors.actor.type")
      *
      * @var string
      */
+    #[Assert\NotBlank(message: 'ra.search_ra_second_factors.actor.blank')]
+    #[Assert\Type('string', message: 'ra.search_ra_second_factors.actor.type')]
     public $actorId;
 
     /**
@@ -61,30 +61,21 @@ final class ExportRaSecondFactorsCommand
     public $institution;
 
     /**
-     * @Assert\Choice(
-     *     {"unverified", "verified", "vetted", "revoked"},
-     *     message="ra.search_ra_second_factors.status.invalid_choice"
-     * )
-     *
      * @var string|null One of the STATUS_* constants.
      */
+    #[Assert\Choice(['unverified', 'verified', 'vetted', 'revoked'], message: 'ra.search_ra_second_factors.status.invalid_choice')]
     public $status;
 
     /**
-     * @Assert\Choice(
-     *     {"name", "type", "secondFactorId", "email", "status"},
-     *     message="ra.search_ra_second_factors.order_by.invalid_choice"
-     * )
-     *
      * @var string|null
      */
+    #[Assert\Choice(['name', 'type', 'secondFactorId', 'email', 'status'], message: 'ra.search_ra_second_factors.order_by.invalid_choice')]
     public $orderBy;
 
     /**
-     * @Assert\Choice({"asc", "desc"}, message="ra.search_ra_second_factors.order_direction.invalid_choice")
-     *
      * @var string|null
      */
+    #[Assert\Choice(['asc', 'desc'], message: 'ra.search_ra_second_factors.order_direction.invalid_choice')]
     public $orderDirection;
 
     /**

src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php

@@ -22,9 +22,7 @@
 
 class SearchRaCandidatesCommand
 {
-    /**
-     * @Assert\NotBlank(message="ra.search_ra_candidates.actor_id.blank")
-     */
+    #[Assert\NotBlank(message: 'ra.search_ra_candidates.actor_id.blank')]
     public string $actorId;
 
     public ?string $institution = null;
@@ -35,22 +33,13 @@ class SearchRaCandidatesCommand
 
     public ?string $raInstitution = null;
 
-    /**
-     * @Assert\Choice(
-     *     {"name", "email"},
-     *     message="ra.search_ra_candidates.order_by.invalid_choice"
-     * )
-     */
+    #[Assert\Choice(['name', 'email'], message: 'ra.search_ra_candidates.order_by.invalid_choice')]
     public ?string $orderBy = null;
 
-    /**
-     * @Assert\Choice({"asc", "desc"}, message="ra.search_ra_candidates.order_direction.invalid_choice")
-     */
+    #[Assert\Choice(['asc', 'desc'], message: 'ra.search_ra_candidates.order_direction.invalid_choice')]
     public ?string $orderDirection = null;
 
-    /**
-     * @Assert\GreaterThan(0, message="ra.search_ra_candidates.page_number.greater_than_zero")
-     */
+    #[Assert\GreaterThan(0, message: 'ra.search_ra_candidates.page_number.greater_than_zero')]
     public int $pageNumber;
 
     public array $institutionFilterOptions;